Repository: ambari Updated Branches: refs/heads/branch-2.2 f36059e26 -> 86a2305c0
AMBARI-15744. Webhcat Server failed to stop while stopping all the services. (part2) (stoader) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86a2305c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86a2305c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86a2305c Branch: refs/heads/branch-2.2 Commit: 86a2305c0a8456dfdbe5e80f3cedd1630cad51b1 Parents: f36059e Author: Toader, Sebastian <[email protected]> Authored: Thu Apr 7 15:13:45 2016 +0200 Committer: Toader, Sebastian <[email protected]> Committed: Thu Apr 7 15:13:45 2016 +0200 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/webhcat_service.py | 5 +++-- .../src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/86a2305c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py index 1d29097..288495a 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py @@ -23,6 +23,7 @@ from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst from resource_management.core.shell import as_user from resource_management.core.logger import Logger +import traceback @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY) def webhcat_service(action='start', rolling_restart=False): @@ -54,8 +55,8 @@ def webhcat_service(action='start', upgrade_type=None): elif action == 'stop': try: graceful_stop(cmd, environ) - except: - Logger.warning("Stopping WebHCat failed !") + except Fail: + Logger.info(traceback.format_exc()) pid_expression = "`" + as_user(format("cat {webhcat_pid_file}"), user=params.webhcat_user) + "`" process_id_exists_command = format("ls {webhcat_pid_file} >/dev/null 2>&1 && ps -p {pid_expression} >/dev/null 2>&1") http://git-wip-us.apache.org/repos/asf/ambari/blob/86a2305c/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py index ea91a62..21c207c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py @@ -20,6 +20,7 @@ limitations under the License. import json from mock.mock import MagicMock, patch from stacks.utils.RMFTestCase import * +from resource_management.core.exceptions import Fail @patch("os.path.isfile", new = MagicMock(return_value=True)) @patch("glob.glob", new = MagicMock(return_value=["one", "two"])) @@ -95,7 +96,7 @@ class TestWebHCatServer(RMFTestCase): self.assert_configure_secured() self.assertNoMoreResources() - @patch("webhcat_service.graceful_stop", new = MagicMock(side_effect=Exception)) + @patch("webhcat_service.graceful_stop", new = MagicMock(side_effect=Fail)) def test_stop_graceful_stop_failed(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", classname = "WebHCatServer", @@ -163,7 +164,7 @@ class TestWebHCatServer(RMFTestCase): ) self.assertNoMoreResources() - @patch("webhcat_service.graceful_stop", new = MagicMock(side_effect=Exception)) + @patch("webhcat_service.graceful_stop", new = MagicMock(side_effect=Fail)) def test_stop_secured_graceful_stop_failed(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/webhcat_server.py", classname = "WebHCatServer",
