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 2014/02/27 15:47:04 UTC
git commit: AMBARI-4844. Oozie server restart fails on stack 1.3.3
with message "ERROR: Stop Oozie first" (Dmytro Shkvyra via aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 724f75364 -> 30c81a603
AMBARI-4844. Oozie server restart fails on stack 1.3.3 with message
"ERROR: Stop Oozie first" (Dmytro Shkvyra via aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/30c81a60
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/30c81a60
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/30c81a60
Branch: refs/heads/trunk
Commit: 30c81a603e262edf6255136e2915b5c3fdfa9970
Parents: 724f753
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Thu Feb 27 06:45:56 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Thu Feb 27 06:46:54 2014 -0800
----------------------------------------------------------------------
.../1.3.2/services/OOZIE/package/scripts/oozie.py | 5 +++++
.../2.0.6/services/OOZIE/package/scripts/oozie.py | 5 +++++
.../python/stacks/1.3.2/OOZIE/test_oozie_server.py | 17 +++++++++++++++++
.../python/stacks/2.0.6/OOZIE/test_oozie_server.py | 9 +++++++++
4 files changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/30c81a60/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
index e2336ef..050bc12 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
@@ -86,6 +86,11 @@ def oozie_ownership(
def oozie_server_specific(
):
import params
+
+ File(params.pid_file,
+ action="delete",
+ not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
+ )
oozie_server_directorties = [params.oozie_pid_dir, params.oozie_log_dir, params.oozie_tmp_dir, params.oozie_data_dir, params.oozie_lib_dir, params.oozie_webapps_dir]
Directory( oozie_server_directorties,
http://git-wip-us.apache.org/repos/asf/ambari/blob/30c81a60/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
index fd3572b..7ea7712 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
@@ -109,6 +109,11 @@ def oozie_server_specific(
):
import params
+ File(params.pid_file,
+ action="delete",
+ not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
+ )
+
oozie_server_directorties = [params.oozie_pid_dir, params.oozie_log_dir, params.oozie_tmp_dir, params.oozie_data_dir, params.oozie_lib_dir, params.oozie_webapps_dir]
Directory( oozie_server_directorties,
owner = params.oozie_user,
http://git-wip-us.apache.org/repos/asf/ambari/blob/30c81a60/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
index 6f8d72a..e79aa00 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/OOZIE/test_oozie_server.py
@@ -78,6 +78,10 @@ class TestOozieServer(RMFTestCase):
owner = 'oozie',
group = 'hadoop',
)
+ self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
+ action=["delete"],
+ not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
+ )
self.assertResourceCalled('Directory', '/var/run/oozie',
owner = 'oozie',
recursive = True,
@@ -147,6 +151,7 @@ class TestOozieServer(RMFTestCase):
self.assertNoMoreResources()
+
def test_stop_default(self):
self.executeScript("1.3.2/services/OOZIE/package/scripts/oozie_server.py",
classname = "OozieServer",
@@ -215,6 +220,10 @@ class TestOozieServer(RMFTestCase):
owner = 'oozie',
group = 'hadoop',
)
+ self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
+ action=["delete"],
+ not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
+ )
self.assertResourceCalled('Directory', '/var/run/oozie',
owner = 'oozie',
recursive = True,
@@ -346,6 +355,10 @@ class TestOozieServer(RMFTestCase):
owner = 'oozie',
group = 'hadoop',
)
+ self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
+ action=["delete"],
+ not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
+ )
self.assertResourceCalled('Directory', '/var/run/oozie',
owner = 'oozie',
recursive = True,
@@ -441,6 +454,10 @@ class TestOozieServer(RMFTestCase):
owner = 'oozie',
group = 'hadoop',
)
+ self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
+ action=["delete"],
+ not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
+ )
self.assertResourceCalled('Directory', '/var/run/oozie',
owner = 'oozie',
recursive = True,
http://git-wip-us.apache.org/repos/asf/ambari/blob/30c81a60/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 51cd982..5cce743 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
@@ -164,6 +164,10 @@ class TestOozieServer(RMFTestCase):
owner = 'oozie',
group = 'hadoop',
)
+ self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
+ action=["delete"],
+ not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
+ )
self.assertResourceCalled('Directory', '/var/run/oozie',
owner = 'oozie',
recursive = True,
@@ -263,6 +267,11 @@ class TestOozieServer(RMFTestCase):
owner = 'oozie',
group = 'hadoop',
)
+ self.assertResourceCalled('File', '/var/run/oozie/oozie.pid',
+ action=["delete"],
+ not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
+ )
+
self.assertResourceCalled('Directory', '/var/run/oozie',
owner = 'oozie',
recursive = True,