Repository: ambari Updated Branches: refs/heads/trunk 84e0849b9 -> 9ceaa15ce
AMBARI-7393. Turn drain mode off is failed when Decommissioning of Region Server (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9ceaa15c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9ceaa15c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9ceaa15c Branch: refs/heads/trunk Commit: 9ceaa15ce6a1bf4c0464a58d3a2639648a53461c Parents: 84e0849 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Fri Oct 3 14:23:17 2014 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Fri Oct 3 14:24:13 2014 +0300 ---------------------------------------------------------------------- .../HBASE/package/scripts/hbase_decommission.py | 62 ++++++++++---------- .../services/HBASE/package/scripts/params.py | 2 +- .../stacks/2.0.6/HBASE/test_hbase_master.py | 6 +- 3 files changed, 33 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9ceaa15c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py index 4f7ed9e..a623927 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase_decommission.py @@ -33,42 +33,42 @@ def hbase_decommission(env): ) if params.hbase_excluded_hosts and params.hbase_excluded_hosts.split(","): + hosts = params.hbase_excluded_hosts.split(",") + elif params.hbase_included_hosts and params.hbase_included_hosts.split(","): + hosts = params.hbase_included_hosts.split(",") - if params.hbase_drain_only == 'true': - hosts = params.hbase_excluded_hosts.split(",") - for host in hosts: - if host: - regiondrainer_cmd = format( - "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} remove {host}") - Execute(regiondrainer_cmd, - user=params.hbase_user, - logoutput=True - ) - pass - pass - - else: + if params.hbase_drain_only: + for host in hosts: + if host: + regiondrainer_cmd = format( + "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} remove {host}") + Execute(regiondrainer_cmd, + user=params.hbase_user, + logoutput=True + ) + pass + pass - hosts = params.hbase_excluded_hosts.split(",") - for host in hosts: - if host: - regiondrainer_cmd = format( - "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} add {host}") - regionmover_cmd = format( - "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_mover} unload {host}") + else: + for host in hosts: + if host: + regiondrainer_cmd = format( + "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_drainer} add {host}") + regionmover_cmd = format( + "{kinit_cmd} {hbase_cmd} --config {hbase_conf_dir} org.jruby.Main {region_mover} unload {host}") - Execute(regiondrainer_cmd, - user=params.hbase_user, - logoutput=True - ) + Execute(regiondrainer_cmd, + user=params.hbase_user, + logoutput=True + ) - Execute(regionmover_cmd, - user=params.hbase_user, - logoutput=True - ) - pass + Execute(regionmover_cmd, + user=params.hbase_user, + logoutput=True + ) pass pass - + pass + pass http://git-wip-us.apache.org/repos/asf/ambari/blob/9ceaa15c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py index 04153bf..1395ebb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py @@ -46,7 +46,7 @@ else: hadoop_conf_dir = "/etc/hadoop/conf" hbase_conf_dir = "/etc/hbase/conf" hbase_excluded_hosts = config['commandParams']['excluded_hosts'] -hbase_drain_only = config['commandParams']['mark_draining_only'] +hbase_drain_only = default("/commandParams/mark_draining_only",False) hbase_included_hosts = config['commandParams']['included_hosts'] hbase_user = status_params.hbase_user http://git-wip-us.apache.org/repos/asf/ambari/blob/9ceaa15c/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py ---------------------------------------------------------------------- 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 a2261fb..856dd9a 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 @@ -103,11 +103,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 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', ' /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', )
