ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject [34/55] [abbrv] ambari git commit: AMBARI-18219. Ambari should use oozied.sh for stopping oozie so that optional catalina args can be provided (Venkat Ranganathan via smohanty)
Date Mon, 22 Aug 2016 13:37:29 GMT
AMBARI-18219. Ambari should use oozied.sh for stopping oozie so that optional catalina args
can be provided (Venkat Ranganathan via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cfef220d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cfef220d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cfef220d

Branch: refs/heads/branch-dev-logsearch
Commit: cfef220d92ed102cde2ed77fe6d12bd973a189a2
Parents: 4c37044
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Sat Aug 20 12:11:10 2016 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Sat Aug 20 12:11:10 2016 -0700

----------------------------------------------------------------------
 .../OOZIE/4.0.0.2.0/package/scripts/oozie_service.py             | 2 +-
 .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/cfef220d/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 74b639b..8371ed1 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
@@ -158,7 +158,7 @@ def oozie_service(action = 'start', upgrade_type=None):
       raise
 
   elif action == 'stop':
-    stop_cmd  = format("cd {oozie_tmp_dir} && {oozie_home}/bin/oozie-stop.sh")
+    stop_cmd  = format("cd {oozie_tmp_dir} && {oozie_home}/bin/oozied.sh stop 60
force")
 
     try:
       # stop oozie

http://git-wip-us.apache.org/repos/asf/ambari/blob/cfef220d/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 f38444b..db7eca3 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,7 +576,7 @@ class TestOozieServer(RMFTestCase):
                          stack_version = self.STACK_VERSION,
                          target = RMFTestCase.TARGET_COMMON_SERVICES
     )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh',
+    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'",
         user = 'oozie',
@@ -706,7 +706,7 @@ class TestOozieServer(RMFTestCase):
                          stack_version = self.STACK_VERSION,
                          target = RMFTestCase.TARGET_COMMON_SERVICES
     )
-    self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-stop.sh',
+    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'",
         user = 'oozie',


Mime
View raw message