Repository: ambari Updated Branches: refs/heads/branch-2.1 73fb0a016 -> a982cd839
AMBARI-13613. Stop-and-Start Upgrade: Handle Mahout in 2.3 -> 2.3 upgrade and downgrade path (Swapan Shridhar via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a982cd83 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a982cd83 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a982cd83 Branch: refs/heads/branch-2.1 Commit: a982cd83955e8e7537891b5cb4a4add76608468d Parents: 73fb0a0 Author: Alejandro Fernandez <[email protected]> Authored: Thu Oct 29 11:27:26 2015 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Thu Oct 29 11:27:26 2015 -0700 ---------------------------------------------------------------------- .../MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py | 4 +++- .../src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a982cd83/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py index fea1ec7..cc41f3a 100644 --- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py +++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout_client.py @@ -18,6 +18,7 @@ limitations under the License. Ambari Agent """ +from resource_management.core.logger import Logger from resource_management.core.exceptions import ClientComponentHasNoStatus from resource_management.libraries.functions import hdp_select from resource_management.libraries.functions import conf_select @@ -31,7 +32,8 @@ class MahoutClient(Script): return {"HDP": "mahout-client"} - def pre_rolling_restart(self, env): + def pre_upgrade_restart(self, env, upgrade_type=None): + Logger.info("Executing Stack Upgrade pre-restart") import params env.set_params(params) http://git-wip-us.apache.org/repos/asf/ambari/blob/a982cd83/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py index 4776859..d1d754a 100644 --- a/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py +++ b/ambari-server/src/test/python/stacks/2.3/MAHOUT/test_mahout_client.py @@ -68,7 +68,7 @@ class TestMahoutClient(RMFTestCase): self.executeScript( self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mahout_client.py", classname = "MahoutClient", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -93,7 +93,7 @@ class TestMahoutClient(RMFTestCase): self.executeScript( self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/mahout_client.py", classname = "MahoutClient", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES,
