You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2012/08/03 10:00:12 UTC
svn commit: r1368824 - in /incubator/oozie/trunk:
core/src/main/java/org/apache/oozie/command/bundle/BundleJobSuspendXCommand.java
release-log.txt
Author: virag
Date: Fri Aug 3 08:00:11 2012
New Revision: 1368824
URL: http://svn.apache.org/viewvc?rev=1368824&view=rev
Log:
OOZIE-930 Bundle not pass SUSPEND command to PAUSED coord job (virag)
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleJobSuspendXCommand.java
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleJobSuspendXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleJobSuspendXCommand.java?rev=1368824&r1=1368823&r2=1368824&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleJobSuspendXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleJobSuspendXCommand.java Fri Aug 3 08:00:11 2012
@@ -151,7 +151,9 @@ public class BundleJobSuspendXCommand ex
public void suspendChildren() throws CommandException {
try {
for (BundleActionBean action : this.bundleActions) {
- if (action.getStatus() == Job.Status.RUNNING || action.getStatus() == Job.Status.PREP) {
+ if (action.getStatus() == Job.Status.RUNNING || action.getStatus() == Job.Status.RUNNINGWITHERROR
+ || action.getStatus() == Job.Status.PREP || action.getStatus() == Job.Status.PAUSED
+ || action.getStatus() == Job.Status.PAUSEDWITHERROR) {
// queue a CoordSuspendXCommand
if (action.getCoordId() != null) {
queue(new CoordSuspendXCommand(action.getCoordId()));
@@ -183,6 +185,12 @@ public class BundleJobSuspendXCommand ex
else if (action.getStatus() == Job.Status.RUNNINGWITHERROR) {
action.setStatus(Job.Status.SUSPENDEDWITHERROR);
}
+ else if (action.getStatus() == Job.Status.PAUSED) {
+ action.setStatus(Job.Status.SUSPENDED);
+ }
+ else if (action.getStatus() == Job.Status.PAUSEDWITHERROR) {
+ action.setStatus(Job.Status.SUSPENDEDWITHERROR);
+ }
action.incrementAndGetPending();
action.setLastModifiedTime(new Date());
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1368824&r1=1368823&r2=1368824&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Fri Aug 3 08:00:11 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.0 release (trunk - unreleased)
+OOZIE-930 Bundle not pass SUSPEND command to PAUSED coord job (virag)
OOZIE-933 Modify the Oozie CLI help to escape the semi-colon when multiple filters are specified (virag)
OOZIE-936 TestActionFailover failing (virag)
OOZIE-931 inconsistency on timestamp format between CLI command and web UI (egashira via virag)