Repository: ambari Updated Branches: refs/heads/branch-2.4 1ad9c076c -> b871ce020 refs/heads/trunk cee5c4215 -> 4eea7ccdc
AMBARI-17068. RU failed because of old service was not stopped (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b871ce02 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b871ce02 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b871ce02 Branch: refs/heads/branch-2.4 Commit: b871ce0204bb9c699c73928af85f013349d8436b Parents: 1ad9c07 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Tue Jun 7 11:35:00 2016 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Tue Jun 7 11:35:40 2016 +0300 ---------------------------------------------------------------------- ambari-agent/src/test/python/resource_management/TestScript.py | 2 +- .../src/main/python/resource_management/libraries/script/script.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b871ce02/ambari-agent/src/test/python/resource_management/TestScript.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/test/python/resource_management/TestScript.py b/ambari-agent/src/test/python/resource_management/TestScript.py index adb8501..65f8c2d 100644 --- a/ambari-agent/src/test/python/resource_management/TestScript.py +++ b/ambari-agent/src/test/python/resource_management/TestScript.py @@ -36,6 +36,7 @@ from resource_management.libraries.script import Script from resource_management.core.environment import Environment from mock.mock import MagicMock, patch + class TestScript(TestCase): def setUp(self): @@ -115,7 +116,6 @@ class TestScript(TestCase): self.assertEqual(open_mock.call_count, 3) self.assertEqual(Script.structuredOut, {"1": "3", "2": "2"}) - def tearDown(self): # enable stdout sys.stdout = sys.__stdout__ http://git-wip-us.apache.org/repos/asf/ambari/blob/b871ce02/ambari-common/src/main/python/resource_management/libraries/script/script.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py index 61759cc..d11fb13 100644 --- a/ambari-common/src/main/python/resource_management/libraries/script/script.py +++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py @@ -664,6 +664,8 @@ class Script(object): services_to_skip = ['RANGER', 'RANGER_KMS'] if service_name in services_to_skip: Logger.info('Temporarily skipping status check for {0} service only.'.format(service_name)) + elif is_stack_upgrade: + Logger.info('Skipping status check for {0} service during upgrade'.format(service_name)) else: self.status(env) raise Fail("Stop command finished but process keep running.")
