You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/10/29 19:22:43 UTC
ambari git commit: AMBARI-13613. Stop-and-Start Upgrade: Handle
Mahout in 2.3 -> 2.3 upgrade and downgrade path (Swapan Shridhar via
alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 9b7c8ffdb -> 397b66f8e
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/397b66f8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/397b66f8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/397b66f8
Branch: refs/heads/trunk
Commit: 397b66f8e8dbf2339447c5a9da7a306bfb217b10
Parents: 9b7c8ff
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Thu Oct 29 11:21:22 2015 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Thu Oct 29 11:21:22 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/397b66f8/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/397b66f8/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 c0daec0..34dda9a 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
@@ -71,7 +71,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)
@@ -96,7 +96,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,