You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/10/06 16:24:24 UTC
[2/3] ambari git commit: AMBARI-18549. oozie server start fails post
upgrade to Ambari 2.4.1 (aonishuk)
AMBARI-18549. oozie server start fails post upgrade to Ambari 2.4.1 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93735179
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93735179
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93735179
Branch: refs/heads/branch-2.4
Commit: 93735179e2660f39a7b6df13d9abb4d0989753aa
Parents: 07d2461
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Oct 6 19:24:11 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Oct 6 19:24:11 2016 +0300
----------------------------------------------------------------------
.../OOZIE/4.0.0.2.0/package/scripts/oozie_service.py | 5 +++++
.../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 8 ++++++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/93735179/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_service.py
----------------------------------------------------------------------
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 ee97a89..16991c8 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
@@ -156,6 +156,11 @@ def oozie_service(action = 'start', upgrade_type=None):
raise
elif action == 'stop':
+ Directory(params.oozie_tmp_dir,
+ owner=params.oozie_user,
+ create_parents = True,
+ )
+
stop_cmd = format("cd {oozie_tmp_dir} && {oozie_home}/bin/oozied.sh stop 60 -force")
try:
http://git-wip-us.apache.org/repos/asf/ambari/blob/93735179/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 b0cc2e9..2a512f4 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
@@ -576,6 +576,10 @@ class TestOozieServer(RMFTestCase):
stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES
)
+ self.assertResourceCalled('Directory', '/var/tmp/oozie',
+ owner = 'oozie',
+ create_parents = True,
+ )
self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozied.sh stop 60 -force',
environment = {'OOZIE_CONFIG': '/etc/oozie/conf'},
only_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1'",
@@ -706,6 +710,10 @@ class TestOozieServer(RMFTestCase):
stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES
)
+ self.assertResourceCalled('Directory', '/var/tmp/oozie',
+ owner = 'oozie',
+ create_parents = True,
+ )
self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozied.sh stop 60 -force',
environment = {'OOZIE_CONFIG': '/etc/oozie/conf'},
only_if = "ambari-sudo.sh su oozie -l -s /bin/bash -c '[RMF_EXPORT_PLACEHOLDER]ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1'",