You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by tb...@apache.org on 2015/01/11 00:29:55 UTC
ambari git commit: AMBARI-9067 - Upgrade pack for Storm (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk ed44a11f4 -> 3d87de5cc
AMBARI-9067 - Upgrade pack for Storm (tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d87de5c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d87de5c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d87de5c
Branch: refs/heads/trunk
Commit: 3d87de5cc22e7ea3f3bfd3e6b9ec73d14066073e
Parents: ed44a11
Author: tbeerbower <tb...@hortonworks.com>
Authored: Sat Jan 10 18:27:06 2015 -0500
Committer: tbeerbower <tb...@hortonworks.com>
Committed: Sat Jan 10 18:27:14 2015 -0500
----------------------------------------------------------------------
.../0.9.1.2.1/package/scripts/drpc_server.py | 15 +++++-
.../STORM/0.9.1.2.1/package/scripts/nimbus.py | 11 ++++-
.../0.9.1.2.1/package/scripts/nimbus_prod.py | 15 +++++-
.../STORM/0.9.1.2.1/package/scripts/params.py | 2 +
.../STORM/0.9.1.2.1/package/scripts/rest_api.py | 11 ++++-
.../0.9.1.2.1/package/scripts/supervisor.py | 11 ++++-
.../package/scripts/supervisor_prod.py | 15 +++++-
.../0.9.1.2.1/package/scripts/ui_server.py | 15 +++++-
.../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 50 +++++++++++++++++++-
.../stacks/2.1/STORM/test_storm_drpc_server.py | 11 +++++
.../stacks/2.1/STORM/test_storm_nimbus.py | 12 ++++-
.../stacks/2.1/STORM/test_storm_nimbus_prod.py | 12 ++++-
.../2.1/STORM/test_storm_rest_api_service.py | 10 ++++
.../stacks/2.1/STORM/test_storm_supervisor.py | 9 ++++
.../2.1/STORM/test_storm_supervisor_prod.py | 9 ++++
.../stacks/2.1/STORM/test_storm_ui_server.py | 11 +++++
.../test/python/stacks/2.1/configs/default.json | 3 +-
17 files changed, 204 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py
index 149b212..338195f 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/drpc_server.py
@@ -26,6 +26,10 @@ from service_check import ServiceCheck
class DrpcServer(Script):
+
+ def get_stack_to_component(self):
+ return {"HDP": "storm-client"}
+
def install(self, env):
self.install_packages(env)
self.configure(env)
@@ -36,14 +40,21 @@ class DrpcServer(Script):
storm()
- def start(self, env):
+ 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 storm-client {version}"))
+
+ def start(self, env, rolling_restart=False):
import params
env.set_params(params)
self.configure(env)
service("drpc", action="start")
- def stop(self, env):
+ def stop(self, env, rolling_restart=False):
import params
env.set_params(params)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py
index 6d68f3e..3ac55d7 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py
@@ -40,7 +40,14 @@ class Nimbus(Script):
storm()
- def start(self, env):
+ 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 storm-nimbus {version}"))
+
+ def start(self, env, rolling_restart=False):
import params
env.set_params(params)
self.configure(env)
@@ -49,7 +56,7 @@ class Nimbus(Script):
self.save_component_version_to_structured_out(params.stack_name)
- def stop(self, env):
+ def stop(self, env, rolling_restart=False):
import params
env.set_params(params)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py
index a1f8afe..2dd8955 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus_prod.py
@@ -25,6 +25,10 @@ from supervisord_service import supervisord_service, supervisord_check_status
class Nimbus(Script):
+
+ def get_stack_to_component(self):
+ return {"HDP": "storm-nimbus"}
+
def install(self, env):
self.install_packages(env)
self.configure(env)
@@ -35,14 +39,21 @@ class Nimbus(Script):
storm()
- def start(self, env):
+ 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 storm-nimbus {version}"))
+
+ def start(self, env, rolling_restart=False):
import params
env.set_params(params)
self.configure(env)
supervisord_service("nimbus", action="start")
- def stop(self, env):
+ def stop(self, env, rolling_restart=False):
import params
env.set_params(params)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
index 6d49d04..eda153a 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
@@ -28,6 +28,8 @@ config = Script.get_config()
stack_name = default("/hostLevelParams/stack_name", None)
+version = default("/commandParams/version", None)
+
stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py
index 890c329..a969987 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/rest_api.py
@@ -41,7 +41,14 @@ class StormRestApi(Script):
storm()
- def start(self, env):
+ 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 storm-client {version}"))
+
+ def start(self, env, rolling_restart=False):
import params
env.set_params(params)
self.configure(env)
@@ -50,7 +57,7 @@ class StormRestApi(Script):
self.save_component_version_to_structured_out(params.stack_name)
- def stop(self, env):
+ def stop(self, env, rolling_restart=False):
import params
env.set_params(params)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py
index 55f191e..2a21d9e 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py
@@ -39,7 +39,14 @@ class Supervisor(Script):
env.set_params(params)
storm()
- def start(self, env):
+ 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 storm-supervisor {version}"))
+
+ def start(self, env, rolling_restart=False):
import params
env.set_params(params)
self.configure(env)
@@ -49,7 +56,7 @@ class Supervisor(Script):
self.save_component_version_to_structured_out(params.stack_name)
- def stop(self, env):
+ def stop(self, env, rolling_restart=False):
import params
env.set_params(params)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py
index 7aecdc5..edece81 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor_prod.py
@@ -26,6 +26,10 @@ from supervisord_service import supervisord_service, supervisord_check_status
class Supervisor(Script):
+
+ def get_stack_to_component(self):
+ return {"HDP": "storm-supervisor"}
+
def install(self, env):
self.install_packages(env)
self.configure(env)
@@ -35,7 +39,14 @@ class Supervisor(Script):
env.set_params(params)
storm()
- def start(self, env):
+ 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 storm-supervisor {version}"))
+
+ def start(self, env, rolling_restart=False):
import params
env.set_params(params)
self.configure(env)
@@ -43,7 +54,7 @@ class Supervisor(Script):
supervisord_service("supervisor", action="start")
service("logviewer", action="start")
- def stop(self, env):
+ def stop(self, env, rolling_restart=False):
import params
env.set_params(params)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py
index 6a9d923..67ebf9c 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py
@@ -26,6 +26,10 @@ from service_check import ServiceCheck
class UiServer(Script):
+
+ def get_stack_to_component(self):
+ return {"HDP": "storm-client"}
+
def install(self, env):
self.install_packages(env)
self.configure(env)
@@ -36,14 +40,21 @@ class UiServer(Script):
storm()
- def start(self, env):
+ 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 storm-client {version}"))
+
+ def start(self, env, rolling_restart=False):
import params
env.set_params(params)
self.configure(env)
service("ui", action="start")
- def stop(self, env):
+ def stop(self, env, rolling_restart=False):
import params
env.set_params(params)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/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 6ecb882..876b997 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
@@ -63,7 +63,7 @@
<batch>
<percent>33</percent>
- <message>Please run additional tests</message>
+ <message>Core Services have been upgraded. You are advised to perform tests against your cluster to ensure proper operation before proceeding with upgrade of remaining services.</message>
</batch>
</group>
@@ -99,6 +99,17 @@
</service>
</group>
+ <group name="STORM" title="Storm">
+ <skippable>true</skippable>
+ <service name="STORM">
+ <component>NIMBUS</component>
+ <component>STORM_REST_API</component>
+ <component>SUPERVISOR</component>
+ <component>STORM_UI_SERVER</component>
+ <component>DRPC_SERVER</component>
+ </service>
+ </group>
+
<group name="CLIENTS" title="Client Components">
<service name="HDFS">
<component>HDFS_CLIENT</component>
@@ -401,5 +412,42 @@
</component>
</service>
+ <service name="STORM">
+ <component name="NIMBUS">
+ <pre-upgrade>
+ <task xsi:type="manual">
+ <message>Deactivate and kill your currently running topology.</message>
+ </task>
+ </pre-upgrade>
+ <upgrade>
+ <task xsi:type="restart" />
+ </upgrade>
+ </component>
+ <component name="STORM_REST_API">
+ <upgrade>
+ <task xsi:type="restart" />
+ </upgrade>
+ </component>
+ <component name="SUPERVISOR">
+ <upgrade>
+ <task xsi:type="restart" />
+ </upgrade>
+ </component>
+ <component name="STORM_UI_SERVER">
+ <upgrade>
+ <task xsi:type="restart" />
+ </upgrade>
+ </component>
+ <component name="DRPC_SERVER">
+ <upgrade>
+ <task xsi:type="restart" />
+ </upgrade>
+ <post-upgrade>
+ <task xsi:type="manual">
+ <message>Rebuild your topology and resubmit the topology using the new jar.</message>
+ </task>
+ </post-upgrade>
+ </component>
+ </service>
</processing>
</upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py
index 336aded..f3223dd 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_drpc_server.py
@@ -140,3 +140,14 @@ class TestStormDrpcServer(TestStormBase):
action = ['delete'],
)
self.assertNoMoreResources()
+
+ def test_pre_rolling_restart(self):
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/drpc_server.py",
+ classname = "DrpcServer",
+ 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 storm-client 2.2.1.0-2067")
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
index d9887d4..7583d77 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
@@ -139,4 +139,14 @@ class TestStormNimbus(TestStormBase):
action = ['delete'],
)
self.assertNoMoreResources()
-
+
+ def test_pre_rolling_restart(self):
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nimbus.py",
+ classname = "Nimbus",
+ 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 storm-nimbus 2.2.1.0-2067")
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py
index 6c7ea30..e68274b 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus_prod.py
@@ -103,4 +103,14 @@ class TestStormNimbus(TestStormBase):
self.assertResourceCalled('Execute', 'supervisorctl stop storm-nimbus',
wait_for_finish = False,
)
- self.assertNoMoreResources()
\ No newline at end of file
+ self.assertNoMoreResources()
+
+ def test_pre_rolling_restart(self):
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/nimbus_prod.py",
+ classname = "Nimbus",
+ 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 storm-nimbus 2.2.1.0-2067")
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py
index 4e29ffa..d4d549e 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_rest_api_service.py
@@ -140,3 +140,13 @@ class TestStormRestApi(TestStormBase):
)
self.assertNoMoreResources()
+ def test_pre_rolling_restart(self):
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/rest_api.py",
+ classname = "StormRestApi",
+ 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 storm-client 2.2.1.0-2067")
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
index 699dce8..9e5f47c 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor.py
@@ -186,3 +186,12 @@ class TestStormSupervisor(TestStormBase):
)
self.assertNoMoreResources()
+ def test_pre_rolling_restart(self):
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/supervisor.py",
+ classname = "Supervisor",
+ 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 storm-supervisor 2.2.1.0-2067")
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py
index 4ae0c4d..dd774a8 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_supervisor_prod.py
@@ -154,3 +154,12 @@ class TestStormSupervisor(TestStormBase):
self.assertNoMoreResources()
+ def test_pre_rolling_restart(self):
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/supervisor_prod.py",
+ classname = "Supervisor",
+ 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 storm-supervisor 2.2.1.0-2067")
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py
index becd591..3bec89d 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_ui_server.py
@@ -138,3 +138,14 @@ class TestStormUiServer(TestStormBase):
action = ['delete'],
)
self.assertNoMoreResources()
+
+ def test_pre_rolling_restart(self):
+ self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/ui_server.py",
+ classname = "UiServer",
+ 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 storm-client 2.2.1.0-2067")
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d87de5c/ambari-server/src/test/python/stacks/2.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json
index 9f22fe8..ac829dd 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json
@@ -20,7 +20,8 @@
"serviceName": "HIVE",
"role": "HIVE_SERVER",
"commandParams": {
- "command_timeout": "300",
+ "version": "2.2.1.0-2067",
+ "command_timeout": "300",
"service_package_folder": "OOZIE",
"script_type": "PYTHON",
"script": "scripts/service_check.py",