You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/10/15 15:30:59 UTC
[1/2] git commit: AMBARI-7787. Decommission of RegionServer failed -
HDP 1.3 (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 862d038f6 -> cf62427dd
refs/heads/trunk cc0303851 -> dd086a5bb
AMBARI-7787. Decommission of RegionServer failed - HDP 1.3 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dd086a5b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dd086a5b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dd086a5b
Branch: refs/heads/trunk
Commit: dd086a5bb4acc54bdb3540374fa62f47df9cf721
Parents: cc03038
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Oct 15 16:30:52 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Oct 15 16:30:52 2014 +0300
----------------------------------------------------------------------
.../HBASE/package/scripts/hbase_decommission.py | 62 ++++++++++----------
.../services/HBASE/package/scripts/params.py | 2 +-
.../stacks/1.3.2/HBASE/test_hbase_master.py | 6 +-
3 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dd086a5b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py
index 4f7ed9e..fb1379a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py
@@ -31,44 +31,44 @@ def hbase_decommission(env):
content=StaticFile("draining_servers.rb"),
mode=0755
)
-
- if params.hbase_excluded_hosts and params.hbase_excluded_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
+ 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(",")
- 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/dd086a5b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
index 8ab8aff..6672b3b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
@@ -32,7 +32,7 @@ region_mover = "/usr/lib/hbase/bin/region_mover.rb"
region_drainer = "/usr/lib/hbase/bin/draining_servers.rb"
hbase_cmd = "/usr/lib/hbase/bin/hbase"
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/dd086a5b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
index 5df3edb..cb1a81d 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
@@ -89,7 +89,7 @@ class TestHBaseMaster(RMFTestCase):
self.assertNoMoreResources()
def test_decom_default_draining_only(self):
- self.executeScript("2.0.6/services/HBASE/package/scripts/hbase_master.py",
+ self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
classname = "HbaseMaster",
command = "decommission",
config_file="default.hbasedecom.json"
@@ -99,11 +99,11 @@ 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', ' /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',
)
- 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 host2',
logoutput = True,
user = 'hbase',
)
[2/2] git commit: AMBARI-7787. Decommission of RegionServer failed -
HDP 1.3 (aonishuk)
Posted by ao...@apache.org.
AMBARI-7787. Decommission of RegionServer failed - HDP 1.3 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cf62427d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cf62427d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cf62427d
Branch: refs/heads/branch-1.7.0
Commit: cf62427dd823cc6698d7bc66a0873c600dabf1fc
Parents: 862d038
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Oct 15 16:30:54 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Oct 15 16:30:54 2014 +0300
----------------------------------------------------------------------
.../HBASE/package/scripts/hbase_decommission.py | 62 ++++++++++----------
.../services/HBASE/package/scripts/params.py | 2 +-
.../stacks/1.3.2/HBASE/test_hbase_master.py | 6 +-
3 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cf62427d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py
index 4f7ed9e..fb1379a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/hbase_decommission.py
@@ -31,44 +31,44 @@ def hbase_decommission(env):
content=StaticFile("draining_servers.rb"),
mode=0755
)
-
- if params.hbase_excluded_hosts and params.hbase_excluded_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
+ 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(",")
- 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/cf62427d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
index 8ab8aff..6672b3b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
@@ -32,7 +32,7 @@ region_mover = "/usr/lib/hbase/bin/region_mover.rb"
region_drainer = "/usr/lib/hbase/bin/draining_servers.rb"
hbase_cmd = "/usr/lib/hbase/bin/hbase"
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/cf62427d/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
index 5df3edb..cb1a81d 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HBASE/test_hbase_master.py
@@ -89,7 +89,7 @@ class TestHBaseMaster(RMFTestCase):
self.assertNoMoreResources()
def test_decom_default_draining_only(self):
- self.executeScript("2.0.6/services/HBASE/package/scripts/hbase_master.py",
+ self.executeScript("1.3.2/services/HBASE/package/scripts/hbase_master.py",
classname = "HbaseMaster",
command = "decommission",
config_file="default.hbasedecom.json"
@@ -99,11 +99,11 @@ 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', ' /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',
)
- 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 host2',
logoutput = True,
user = 'hbase',
)