Repository: ambari Updated Branches: refs/heads/trunk b89786e88 -> b0a345635
AMBARI-9107. Upgrade pack for Slider (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0a34563 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0a34563 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0a34563 Branch: refs/heads/trunk Commit: b0a345635edf585ec8efd8e44cfbc3ff6baf329d Parents: b89786e Author: Lisnichenko Dmitro <[email protected]> Authored: Wed Jan 14 11:05:19 2015 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Wed Jan 14 11:05:19 2015 +0200 ---------------------------------------------------------------------- .../SLIDER/0.60.0.2.2/package/scripts/params.py | 3 ++ .../0.60.0.2.2/package/scripts/slider_client.py | 7 ++++ .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 40 +++++++++++++------- .../stacks/2.2/SLIDER/test_slider_client.py | 10 +++++ .../test/python/stacks/2.2/configs/default.json | 1 + 5 files changed, 47 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b0a34563/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py index 8ed1fac..2ee07d7 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py @@ -27,6 +27,9 @@ config = Script.get_config() stack_name = default("/hostLevelParams/stack_name", None) +# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade +version = default("/commandParams/version", None) + stack_version_unformatted = str(config['hostLevelParams']['stack_version']) hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) http://git-wip-us.apache.org/repos/asf/ambari/blob/b0a34563/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 060fc3b..ca74c35 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 @@ -28,6 +28,13 @@ class SliderClient(Script): def get_stack_to_component(self): return {"HDP": "slider-client"} + def pre_rolling_restart(self, env): + import params + env.set_params(params) + + 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}")) + def install(self, env): self.install_packages(env) self.configure(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/b0a34563/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml index ed20882..15aa1f5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml @@ -122,24 +122,28 @@ <service name="MAPREDUCE2"> <component>MAPREDUCE2_CLIENT</component> - </service> + </service> + + <service name="TEZ"> + <component>TEZ_CLIENT</component> + </service> - <service name="TEZ"> - <component>TEZ_CLIENT</component> - </service> + <service name="HBASE"> + <component>HBASE_CLIENT</component> + </service> - <service name="HBASE"> - <component>HBASE_CLIENT</component> - </service> + <service name="PIG"> + <component>PIG</component> + </service> - <service name="PIG"> - <component name="PIG" /> - </service> + <service name="HIVE"> + <component>HIVE_CLIENT</component> + <component>HCAT</component> + </service> - <service name="HIVE"> - <component>HIVE_CLIENT</component> - <component>HCAT</component> - </service> + <service name="SLIDER"> + <component>SLIDER</component> + </service> </group> <group xsi:type="cluster" name="POST_CLUSTER" title="Finalize Upgrade"> @@ -374,6 +378,14 @@ </component> </service> + <service name="SLIDER"> + <component name="SLIDER"> + <upgrade> + <task xsi:type="restart" /> + </upgrade> + </component> + </service> + <service name="OOZIE"> <component name="OOZIE_SERVER"> <pre-upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/b0a34563/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 28b1ac1..0b5cdd1 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 @@ -106,3 +106,13 @@ class TestSliderClient(RMFTestCase): ) self.assertNoMoreResources() + + def test_pre_rolling_restart(self): + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/slider_client.py", + classname = "SliderClient", + command = "pre_rolling_restart", + config_file="default.json", + 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 http://git-wip-us.apache.org/repos/asf/ambari/blob/b0a34563/ambari-server/src/test/python/stacks/2.2/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/default.json b/ambari-server/src/test/python/stacks/2.2/configs/default.json index 28a17ae..15ffb66 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/default.json @@ -20,6 +20,7 @@ "serviceName": "SLIDER", "role": "SLIDER", "commandParams": { + "version": "2.2.1.0-2067", "command_timeout": "300", "service_package_folder": "OOZIE", "script_type": "PYTHON",
