[ambari] branch branch-2.6 updated: AMBARI-22918 Decommission RegionServer fails when kerberos is enabled

[rlevas]

This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
 new 9b499f4  AMBARI-22918 Decommission RegionServer fails when kerberos is 
enabled
9b499f4 is described below

commit 9b499f49087a56772be3c281935bac3f771d7ca3
Author: Toshihiro Suzuki 
AuthorDate: Thu Feb 15 12:06:32 2018 +0900

AMBARI-22918 Decommission RegionServer fails when kerberos is enabled
---
 .../test/python/stacks/2.0.6/HBASE/test_hbase_master.py| 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index e31b7e5..678e86e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -185,19 +185,19 @@ class TestHBaseMaster(RMFTestCase):
   content = StaticFile('draining_servers.rb'),
   mode = 0755,
   )
-self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf  org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb add 
host1',
+self.assertResourceCalled('Execute', ' HBASE_OPTS="$HBASE_OPTS " 
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf org.jruby.Main 
/usr/lib/hbase/bin/draining_servers.rb add host1',
   logoutput = True,
   user = 'hbase',
   )
-self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf  org.jruby.Main /usr/lib/hbase/bin/region_mover.rb unload 
host1',
+self.assertResourceCalled('Execute', ' HBASE_OPTS="$HBASE_OPTS " 
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf org.jruby.Main 
/usr/lib/hbase/bin/region_mover.rb unload host1',
   logoutput = True,
   user = 'hbase',
   )
-self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf  org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb add 
host2',
+self.assertResourceCalled('Execute', ' HBASE_OPTS="$HBASE_OPTS " 
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf org.jruby.Main 
/usr/lib/hbase/bin/draining_servers.rb add host2',
   logoutput = True,
   user = 'hbase',
   )
-self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf  org.jruby.Main /usr/lib/hbase/bin/region_mover.rb unload 
host2',
+self.assertResourceCalled('Execute', ' HBASE_OPTS="$HBASE_OPTS " 
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf org.jruby.Main 
/usr/lib/hbase/bin/region_mover.rb unload host2',
   logoutput = True,
   user = 'hbase',
   )
@@ -216,7 +216,7 @@ class TestHBaseMaster(RMFTestCase):
   content = StaticFile('draining_servers.rb'),
   mode = 0755,
   )
-self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf  org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb remove 
host1',
+self.assertResourceCalled('Execute', ' HBASE_OPTS="$HBASE_OPTS " 
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf org.jruby.Main 
/usr/lib/hbase/bin/draining_servers.rb remove host1',
   logoutput = True,
   user = 'hbase',
   )
@@ -284,11 +284,11 @@ class TestHBaseMaster(RMFTestCase):
   content = StaticFile('draining_servers.rb'),
   mode = 0755,
   )
-self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hbase.service.keytab 
hbase/c6401.ambari.apache@example.com; /usr/lib/hbase/bin/hbase --config 
/etc/hbase/conf 
-Djava.security.auth.login.config=/etc/hbase/conf/hbase_master_jaas.conf 
org.jruby.Main /usr/lib/hbase/bin/draining_servers.rb add host1',
+self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hbase.service.keytab 
hbase/c6401.ambari.apache@example.com; HBASE_OPTS="$HBASE_OPTS 
-Djava.security.auth.login.config=/etc/hbase/conf/hbase_master_jaas.conf" 
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf org.jruby.Main 
/usr/lib/hbase/bin/draining_servers.rb add host1',
   logoutput = True,
   user = 'hbase',
   )
-self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hbase.servi

[ambari] branch branch-2.6 updated: AMBARI-22918 Decommission RegionServer fails when kerberos is enabled

[swagle]

This is an automated email from the ASF dual-hosted git repository.

swagle pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
 new f40a400  AMBARI-22918 Decommission RegionServer fails when kerberos is 
enabled
f40a400 is described below

commit f40a400da39cff9bd2c32ea6c5f33a256467e1e8
Author: Toshihiro Suzuki 
AuthorDate: Wed Feb 7 09:37:50 2018 +0900

AMBARI-22918 Decommission RegionServer fails when kerberos is enabled
---
 .../HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py
index 022465a..24ed397 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_decommission.py
@@ -63,7 +63,7 @@ def hbase_decommission(env):
 for host in hosts:
   if host:
 regiondrainer_cmd = format(
-  "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} 
{master_security_config} org.jruby.Main {region_drainer} remove {host}")
+  "{kinit_cmd} HBASE_OPTS=\"$HBASE_OPTS {master_security_config}\" 
{hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} remove 
{host}")
 Execute(regiondrainer_cmd,
 user=params.hbase_user,
 logoutput=True
@@ -75,9 +75,9 @@ def hbase_decommission(env):
 for host in hosts:
   if host:
 regiondrainer_cmd = format(
-  "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} 
{master_security_config} org.jruby.Main {region_drainer} add {host}")
+  "{kinit_cmd} HBASE_OPTS=\"$HBASE_OPTS {master_security_config}\" 
{hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} add 
{host}")
 regionmover_cmd = format(
-  "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} 
{master_security_config} org.jruby.Main {region_mover} unload {host}")
+  "{kinit_cmd} HBASE_OPTS=\"$HBASE_OPTS {master_security_config}\" 
{hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_mover} unload 
{host}")
 
 Execute(regiondrainer_cmd,
 user=params.hbase_user,

-- 
To stop receiving notification emails like this one, please contact
swa...@apache.org.