Repository: ambari Updated Branches: refs/heads/trunk 6525b7527 -> f04e43001
AMBARI-5130. Ambari stack upgrade, cannot delete Mapreduce using UpgradeHelper_HDP2.py (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f04e4300 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f04e4300 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f04e4300 Branch: refs/heads/trunk Commit: f04e4300142f8897bd6aa8171c114f892ba5d947 Parents: 6525b75 Author: Andrew Onischuk <[email protected]> Authored: Sun Mar 16 12:48:05 2014 -0700 Committer: Andrew Onischuk <[email protected]> Committed: Sun Mar 16 12:48:05 2014 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/UpgradeHelper_HDP2.py | 5 +++-- ambari-server/src/test/python/TestUpgradeScript_HDP2.py | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f04e4300/ambari-server/src/main/python/UpgradeHelper_HDP2.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/UpgradeHelper_HDP2.py b/ambari-server/src/main/python/UpgradeHelper_HDP2.py index 13d5c31..ae12f70 100644 --- a/ambari-server/src/main/python/UpgradeHelper_HDP2.py +++ b/ambari-server/src/main/python/UpgradeHelper_HDP2.py @@ -651,7 +651,7 @@ def read_mapping(): def get_mr1_mapping(options): - components = ["MAPREDUCE_CLIENT", "JOBTRACKER", "TASKTRACKER"] + components = ["MAPREDUCE_CLIENT", "JOBTRACKER", "TASKTRACKER", "HISTORYSERVER"] GET_URL_FORMAT = URL_FORMAT + '/services/MAPREDUCE/components/{2}' hostmapping = {} for component in components: @@ -705,7 +705,7 @@ def delete_mr(options): SERVICE_URL_FORMAT = URL_FORMAT + '/services/MAPREDUCE' COMPONENT_URL_FORMAT = URL_FORMAT + '/hosts/{2}/host_components/{3}' - NON_CLIENTS = ["JOBTRACKER", "TASKTRACKER"] + NON_CLIENTS = ["JOBTRACKER", "TASKTRACKER", "HISTORYSERVER"] PUT_IN_DISABLED = """{"HostRoles": {"state": "DISABLED"}}""" hostmapping = read_mapping() @@ -747,6 +747,7 @@ def add_services(options): new_old_host_map = { "NODEMANAGER": "TASKTRACKER", "HISTORYSERVER": "JOBTRACKER", + "HISTORYSERVER": "HISTORYSERVER", "RESOURCEMANAGER": "JOBTRACKER", "YARN_CLIENT": "MAPREDUCE_CLIENT", "MAPREDUCE2_CLIENT": "MAPREDUCE_CLIENT"} http://git-wip-us.apache.org/repos/asf/ambari/blob/f04e4300/ambari-server/src/test/python/TestUpgradeScript_HDP2.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/TestUpgradeScript_HDP2.py b/ambari-server/src/test/python/TestUpgradeScript_HDP2.py index dcad96c..652ab1c 100644 --- a/ambari-server/src/test/python/TestUpgradeScript_HDP2.py +++ b/ambari-server/src/test/python/TestUpgradeScript_HDP2.py @@ -141,7 +141,7 @@ class TestUpgradeHDP2Script(TestCase): options = self.get_mock_options() args = ["save-mr-mapping"] opm.parse_args.return_value = (options, args) - curl_mock.side_effect = ['"href" : "', '"href" : "', '"href" : "'] + curl_mock.side_effect = ['"href" : "', '"href" : "', '"href" : "', '"href" : "'] json_loads_mock.return_value = {"host_components": [{"HostRoles": {"host_name": "host1"}}]} UpgradeHelper_HDP2.main() expected_curl_calls = [ @@ -211,6 +211,7 @@ class TestUpgradeHDP2Script(TestCase): read_mapping_mock.return_value = { "TASKTRACKER": ["c6401", "c6402"], "JOBTRACKER": ["c6401"], + "HISTORYSERVER": ["c6402"], "MAPREDUCE_CLIENT": ["c6403"]} UpgradeHelper_HDP2.main() expected_curl_calls = [ @@ -229,8 +230,6 @@ class TestUpgradeHDP2Script(TestCase): call(False, "-u", "admin:admin", '-H', 'X-Requested-By: ambari', "-X", "POST", "http://localhost:8080/api/v1/clusters/c1/services/YARN/components/RESOURCEMANAGER";), call(False, "-u", "admin:admin", '-H', 'X-Requested-By: ambari', "-X", "POST", - "http://localhost:8080/api/v1/clusters/c1/hosts/c6401/host_components/HISTORYSERVER";), - call(False, "-u", "admin:admin", '-H', 'X-Requested-By: ambari', "-X", "POST", "http://localhost:8080/api/v1/clusters/c1/hosts/c6401/host_components/NODEMANAGER";), call(False, "-u", "admin:admin", '-H', 'X-Requested-By: ambari', "-X", "POST", "http://localhost:8080/api/v1/clusters/c1/hosts/c6402/host_components/NODEMANAGER";),
