Repository: ambari Updated Branches: refs/heads/trunk e465ddad2 -> 80b4392ab
AMBARI-9160 - Hadoop Clients Should Update All Clients During Rolling Upgrade (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/80b4392a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/80b4392a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/80b4392a Branch: refs/heads/trunk Commit: 80b4392abdab68eb820c8c405039104f7ad0d610 Parents: e465dda Author: Jonathan Hurley <[email protected]> Authored: Thu Jan 15 16:55:16 2015 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Fri Jan 16 09:18:20 2015 -0500 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/package/scripts/hbase_client.py | 5 +++++ .../SLIDER/0.60.0.2.2/package/scripts/slider_client.py | 5 +++++ .../src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 1 + .../src/test/python/stacks/2.2/SLIDER/test_slider_client.py | 4 +++- 4 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/80b4392a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py index b00a82e..f66ea16 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_client.py @@ -36,6 +36,11 @@ class HbaseClient(Script): if params.version and compare_versions(format_hdp_stack_version(params.version), '2.2.0.0') >= 0: Execute(format("hdp-select set hbase-client {version}")) + # set all of the hadoop clientss since hbase client is upgraded as part + # of the final "CLIENTS" group and we need to ensure that hadoop-client + # is also set + Execute(format("hdp-select set hadoop-client {version}")) + def install(self, env): self.install_packages(env) self.configure(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/80b4392a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py index ca74c35..2c99c54 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/slider_client.py @@ -35,6 +35,11 @@ class SliderClient(Script): if params.version and compare_versions(format_hdp_stack_version(params.version), '2.2.0.0') >= 0: Execute(format("hdp-select set slider-client {version}")) + # also set all of the hadoop clients since slider client is upgraded as + # part of the final "CLIENTS" group and we need to ensure that + # hadoop-client is also set + Execute(format("hdp-select set hadoop-client {version}")) + def install(self, env): self.install_packages(env) self.configure(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/80b4392a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py index b352d90..95c69c0 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py @@ -200,5 +200,6 @@ class TestHBaseClient(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled("Execute", "hdp-select set hbase-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") # for now, it's enough that hdp-select is confirmed http://git-wip-us.apache.org/repos/asf/ambari/blob/80b4392a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py index 0b5cdd1..f6dfbc0 100644 --- a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py +++ b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py @@ -115,4 +115,6 @@ class TestSliderClient(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled("Execute", "hdp-select set slider-client 2.2.1.0-2067") \ No newline at end of file + self.assertResourceCalled("Execute", "hdp-select set slider-client 2.2.1.0-2067") + self.assertResourceCalled("Execute", "hdp-select set hadoop-client 2.2.1.0-2067") + self.assertNoMoreResources() \ No newline at end of file
