Repository: ambari Updated Branches: refs/heads/trunk b9d68d2a1 -> 50d36f9a5
AMBARI-13590. Additional fix. Stop-and-Start Upgrade: Handle Oozie in all upgrade paths (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/50d36f9a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/50d36f9a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/50d36f9a Branch: refs/heads/trunk Commit: 50d36f9a58663548a730e327341031cccfffa176 Parents: b9d68d2 Author: Alejandro Fernandez <[email protected]> Authored: Wed Oct 28 15:34:47 2015 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Wed Oct 28 15:34:47 2015 -0700 ---------------------------------------------------------------------- .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py | 8 ++++---- .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/50d36f9a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py index a21346d..8219f6e 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py @@ -198,7 +198,7 @@ class TestOozieClient(RMFTestCase): ) self.assertNoMoreResources() - def test_pre_rolling_restart(self): + def test_pre_upgrade_restart(self): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -206,7 +206,7 @@ class TestOozieClient(RMFTestCase): json_content['commandParams']['version'] = version self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_client.py", classname = "OozieClient", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) @@ -216,7 +216,7 @@ class TestOozieClient(RMFTestCase): @patch("resource_management.core.shell.call") - def test_pre_rolling_restart_23(self, call_mock): + def test_pre_upgrade_restart_23(self, call_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -226,7 +226,7 @@ class TestOozieClient(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_client.py", classname = "OozieClient", - command = "pre_rolling_restart", + command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, http://git-wip-us.apache.org/repos/asf/ambari/blob/50d36f9a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py index b931378..a437916 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py @@ -1162,7 +1162,7 @@ class TestOozieServer(RMFTestCase): New Oozie WAR file with added 'JARs' at /var/lib/oozie/oozie-server/webapps/oozie.war""" self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", - classname = "OozieServer", command = "pre_rolling_restart", config_file = "oozie-upgrade.json", + classname = "OozieServer", command = "pre_upgrade_restart", config_file = "oozie-upgrade.json", hdp_stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, prepare_war_stdout)]) @@ -1229,7 +1229,7 @@ class TestOozieServer(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", - classname = "OozieServer", command = "pre_rolling_restart", config_dict = json_content, + classname = "OozieServer", command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None), (0, prepare_war_stdout)], @@ -1292,7 +1292,7 @@ class TestOozieServer(RMFTestCase): New Oozie WAR file with added 'JARs' at /var/lib/oozie/oozie-server/webapps/oozie.war""" self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", - classname = "OozieServer", command = "pre_rolling_restart", config_file = "oozie-downgrade.json", + classname = "OozieServer", command = "pre_upgrade_restart", config_file = "oozie-downgrade.json", hdp_stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, prepare_war_stdout)]) @@ -1487,7 +1487,7 @@ class TestOozieServer(RMFTestCase): mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", - classname = "OozieServer", command = "pre_rolling_restart", config_dict = json_content, + classname = "OozieServer", command = "pre_upgrade_restart", config_dict = json_content, hdp_stack_version = self.UPGRADE_STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, call_mocks = [(0, None), (0, prepare_war_stdout)],
