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/07/23 08:52:58 UTC

svn commit: r1364518 - in /incubator/oozie/trunk: core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java release-log.txt

Author: virag
Date: Mon Jul 23 06:52:57 2012
New Revision: 1364518

URL: http://svn.apache.org/viewvc?rev=1364518&view=rev
Log:
OOZIE-707 Suspending a paused coordinator job suspends the children but the status of job remains unchanged (virag)

Modified:
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java?rev=1364518&r1=1364517&r2=1364518&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java Mon Jul 23 06:52:57 2012
@@ -52,6 +52,12 @@ public abstract class SuspendTransitionX
         else if (job.getStatus() == Job.Status.RUNNING) {
             job.setStatus(Job.Status.SUSPENDED);
         }
+        else if (job.getStatus() == Job.Status.PAUSED) {
+            job.setStatus(Job.Status.SUSPENDED);
+        }
+        else if (job.getStatus() == Job.Status.PREPPAUSED) {
+            job.setStatus(Job.Status.PREPSUSPENDED);
+        }
         job.setPending();
     }
 

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java?rev=1364518&r1=1364517&r2=1364518&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java Mon Jul 23 06:52:57 2012
@@ -226,6 +226,12 @@ public class CoordSuspendXCommand extend
         else if (coordJob.getStatus() == Job.Status.RUNNING) {
             coordJob.setStatus(Job.Status.SUSPENDED);
         }
+        else if (coordJob.getStatus() == Job.Status.PAUSED) {
+            coordJob.setStatus(Job.Status.SUSPENDED);
+        }
+        else if (coordJob.getStatus() == Job.Status.PREPPAUSED) {
+            coordJob.setStatus(Job.Status.PREPSUSPENDED);
+        }
         coordJob.setPending();
     }
 

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1364518&r1=1364517&r2=1364518&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Jul 23 06:52:57 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.3.0 release (trunk - unreleased)
 
+OOZIE-707 Suspending a paused coordinator job suspends the children but the status of job remains unchanged (virag)
 OOZIE-917 Coordinator Job from 'KILLED' or 'FAILED' doesn't move to 'DONEWITHERROR' if the job materialization is not done(virag)
 OOZIE-916 aggregator example uses hardcoded 'examples' value instead of parameterized (examplesRoot) value in path (wypoon via virag)
 OOZIE-904 TestBundleStartX Failing (virag)