Author: virag
Date: Wed May 15 17:53:22 2013
New Revision: 1482980
URL: http://svn.apache.org/r1482980
Log:
OOZIE-1356 Bundle job in PAUSEWITHERROR state does not goto SUSPENDEDWITHERROR
state on suspending it (bowenzhangusa via virag)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobSuspendXCommand.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java?rev=1482980&r1=1482979&r2=1482980&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/SuspendTransitionXCommand.java
Wed May 15 17:53:22 2013
@@ -52,7 +52,7 @@ public abstract class SuspendTransitionX
else if (job.getStatus() == Job.Status.RUNNING) {
job.setStatus(Job.Status.SUSPENDED);
}
- else if (job.getStatus() == Job.Status.RUNNINGWITHERROR){
+ else if (job.getStatus() == Job.Status.RUNNINGWITHERROR ||
job.getStatus() == Job.Status.PAUSEDWITHERROR){
job.setStatus(Job.Status.SUSPENDEDWITHERROR);
}
else if (job.getStatus() == Job.Status.PAUSED) {
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobSuspendXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobSuspendXCommand.java?rev=1482980&r1=1482979&r2=1482980&view=diff
==============================================================================
---
oozie/trunk/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobSuspendXCommand.java
(original)
+++
oozie/trunk/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobSuspendXCommand.java
Wed May 15 17:53:22 2013
@@ -95,6 +95,27 @@ public class TestBundleJobSuspendXComman
job = jpaService.execute(bundleJobGetCmd);
assertEquals(Job.Status.SUSPENDEDWITHERROR, job.getStatus());
}
+
+ /**
+ * Test : Suspend bundle job in PAUSEDWITHERROR state
+ *
+ * @throws Exception
+ */
+ public void testBundleSuspendWithError2() throws Exception {
+ BundleJobBean job =
this.addRecordToBundleJobTable(Job.Status.PAUSEDWITHERROR, false);
+
+ JPAService jpaService = Services.get().get(JPAService.class);
+ assertNotNull(jpaService);
+ BundleJobGetJPAExecutor bundleJobGetCmd = new
BundleJobGetJPAExecutor(job.getId());
+ job = jpaService.execute(bundleJobGetCmd);
+ assertEquals(Job.Status.PAUSEDWITHERROR, job.getStatus());
+
+ new BundleJobSuspendXCommand(job.getId()).call();
+
+ job = jpaService.execute(bundleJobGetCmd);
+ assertEquals(Job.Status.SUSPENDEDWITHERROR, job.getStatus());
+ }
+
/**
* Test : Suspend bundle job
*
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1482980&r1=1482979&r2=1482980&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Wed May 15 17:53:22 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1356 Bundle job in PAUSEWITHERROR state does not goto SUSPENDEDWITHERROR
state on suspending it (bowenzhangusa via virag)
OOZIE-1313 coverage fix for org.apache.oozie.client (aleksgor via virag)
OOZIE-1360 Oozie CLI shows created time of workflow as started time (ryota via
virag)
OOZIE-1359 mention default value of throttle in doc (ryota via virag)
