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

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


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

commit c5111096eb5a5716317f3453c886356a020171a1
Author: Toshihiro Suzuki <[email protected]>
AuthorDate: Thu Feb 15 11:47:23 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 e32393d..e10fffc 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/[email protected]; /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/[email protected]; 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.service.keytab 
hbase/[email protected]; /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/region_mover.rb unload host1',
+    self.assertResourceCalled('Execute', '/usr/bin/kinit -kt 
/etc/security/keytabs/hbase.service.keytab 
hbase/[email protected]; 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/region_mover.rb unload host1',
                               logoutput = True,
                               user = 'hbase',
                               )

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to