diff options
| author | Attila Doroszlai <adoroszlai@hortonworks.com> | 2016-10-14 11:15:27 +0200 |
|---|---|---|
| committer | Toader, Sebastian <stoader@hortonworks.com> | 2016-10-14 11:27:29 +0200 |
| commit | 559a12030ff41ee3f14b929a7e230994d2c6bcad (patch) | |
| tree | f1268a11ccfc26711c3b55c9f2121c08fd4e9a0e | |
| parent | b6eae9deb9fbbabdead3b0fc9f93f0c554d0e0b1 (diff) | |
AMBARI-18567. Cannot start Oozie if WebHDFS is disabled. (Attila Doroszlai via stoader)
| -rw-r--r-- | ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py | 2 | ||||
| -rw-r--r-- | ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py index 16991c89ac..de9885254e 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py @@ -24,7 +24,7 @@ import os from oozie import copy_atlas_hive_hook_to_dfs_share_lib # Resource Managemente Imports -from resource_management.core import sudo +from resource_management.core import shell, sudo from resource_management import * from resource_management.core.shell import as_user from resource_management.core.logger import Logger 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 2a512f416b..bfa6d45a0f 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 @@ -510,6 +510,9 @@ class TestOozieServer(RMFTestCase): @patch("os.path.isfile") @patch('os.path.exists', new=MagicMock(side_effect = [False, True, False, True])) def test_start_default(self, isfile_mock, call_mocks): + self._test_start(isfile_mock, call_mocks) + + def _test_start(self, isfile_mock, call_mocks): isfile_mock.return_value = True call_mocks = MagicMock(return_value=(0, "New Oozie WAR file with added")) self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", @@ -568,6 +571,13 @@ class TestOozieServer(RMFTestCase): ) self.assertNoMoreResources() + @patch.object(WebHDFSUtil, 'is_webhdfs_available', return_value=False) + @patch.object(shell, "call") + @patch("os.path.isfile") + @patch('os.path.exists', new=MagicMock(side_effect = [False, True, False, True])) + def test_start_no_webhdfs(self, webhdfsutil_mock, isfile_mock, call_mocks): + self._test_start(isfile_mock, call_mocks) + def test_stop_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/oozie_server.py", classname = "OozieServer", |