Repository: ambari Updated Branches: refs/heads/trunk 5ba9a426e -> 875bcfe4a
AMBARI-11090. Oozie start is not idempotent Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/875bcfe4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/875bcfe4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/875bcfe4 Branch: refs/heads/trunk Commit: 875bcfe4a4ebd78d4415d8d7ff6c2e6722a0fafb Parents: 5ba9a42 Author: Sumit Mohanty <[email protected]> Authored: Tue May 12 17:07:13 2015 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Tue May 12 17:07:13 2015 -0700 ---------------------------------------------------------------------- .../common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py | 2 +- .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/875bcfe4/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py index ae66eb0..c773fca 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py @@ -179,7 +179,7 @@ def oozie_server_specific(): File(params.pid_file, action="delete", - not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)" + not_if=format("ls {pid_file} >/dev/null 2>&1 && ps -p `cat {pid_file}` >/dev/null 2>&1") ) oozie_server_directories = [format("{oozie_home}/{oozie_tmp_dir}"), params.oozie_pid_dir, params.oozie_log_dir, params.oozie_tmp_dir, params.oozie_data_dir, params.oozie_lib_dir, params.oozie_webapps_dir, params.oozie_webapps_conf_dir, params.oozie_server_dir] http://git-wip-us.apache.org/repos/asf/ambari/blob/875bcfe4/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 4a6c5ab..fdcafdb 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 @@ -121,7 +121,7 @@ class TestOozieServer(RMFTestCase): ) 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)', + not_if = u'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1', ) self.assertResourceCalled('Directory', '/usr/lib/oozie//var/tmp/oozie', owner = 'oozie', @@ -402,7 +402,7 @@ class TestOozieServer(RMFTestCase): ) 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)" + not_if="ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1" ) self.assertResourceCalled('Directory', '/usr/lib/oozie//var/tmp/oozie', owner = 'oozie', @@ -570,7 +570,7 @@ class TestOozieServer(RMFTestCase): ) 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)" + not_if="ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1" ) self.assertResourceCalled('Directory', '/usr/lib/oozie//var/tmp/oozie', owner = 'oozie',
