svn commit: r1487090 - in /incubator/ambari/trunk: CHANGES.txt ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp

[jaimin]

Author: jaimin
Date: Tue May 28 20:07:17 2013
New Revision: 1487090

URL: http://svn.apache.org/r1487090
Log:
AMBARI-2162. HBase master stop fails while stopping all services in secure 
cluster. (jaimin)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487090&r1=1487089&r2=1487090&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue May 28 20:07:17 2013
@@ -895,6 +895,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2162. HBase master stop fails while stopping all services in
+ secure cluster. (jaimin)
+
  AMBARI-2197. Jobs page usability issues - remove the "ramps". (srimanth)
 
  AMBARI-2196. Install Wizard, Customize Services changes. (srimanth)

Modified: 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp?rev=1487090&r1=1487089&r2=1487090&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
 (original)
+++ 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
 Tue May 28 20:07:17 2013
@@ -100,7 +100,7 @@ class hdp-hbase(
     hdp-hbase::configfile { 'regionservers':}
 
     if ($security_enabled == true) {
-      if ($type == 'master') {
+      if ($type == 'master' and $service_state == 'running') {
         hdp-hbase::configfile { 'hbase_master_jaas.conf' : }
 
         $hbase_grant_premissions_file = '/tmp/hbase_grant_permissions.sh'
@@ -111,18 +111,20 @@ class hdp-hbase(
           mode => '0644',
           content => template('hdp-hbase/hbase_grant_permissions.erb')
         }
-
+        $hbase_principal = $hdp-hbase::params::hbase_master_principal
+        $hbase_user_keytab = $hdp-hbase::params::hbase_keytab_path
+        $kinit_cmd = "${hdp::params::kinit_path_local} -kt 
${hbase_user_keytab} ${hbase_principal};"
         hdp::exec { '${smokeuser}_grant_privileges' :
-          command => "su - ${smoke_test_user} -c 'hbase --config $conf_dir 
shell ${hbase_grant_premissions_file}'",
+          command => "su - ${hbase_user} -c '$kinit_cmd hbase --config 
$conf_dir shell ${hbase_grant_premissions_file}'",
           require => File[$hbase_grant_premissions_file]
         }
 
         Hdp-hbase::Configfile<||> -> File[$hbase_grant_premissions_file] ->
         Hdp::Exec['${smokeuser}_grant_privileges'] -> Anchor['hdp-hbase::end']
 
-      } elsif ($type == 'regionserver') {
+      } elsif ($type == 'regionserver' and $service_state == 'running') {
         hdp-hbase::configfile { 'hbase_regionserver_jaas.conf' : }
-      } else {
+      } elsif ($type == 'client') {
         hdp-hbase::configfile { 'hbase_client_jaas.conf' : }
       }
     }