Author: virag
Date: Mon Apr 29 21:44:51 2013
New Revision: 1477360
URL: http://svn.apache.org/r1477360
Log:
OOZIE-1351 Oozie jobs with state PAUSEDWITHERROR should change to
SUSPENDEDWITHERROR state when suspended (bowenzhangusa via virag)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSuspendXCommand.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java?rev=1477360&r1=1477359&r2=1477360&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
Mon Apr 29 21:44:51 2013
@@ -223,7 +223,7 @@ public class CoordSuspendXCommand extend
else if (coordJob.getStatus() == Job.Status.RUNNING) {
coordJob.setStatus(Job.Status.SUSPENDED);
}
- else if (coordJob.getStatus() == Job.Status.RUNNINGWITHERROR) {
+ else if (coordJob.getStatus() == Job.Status.RUNNINGWITHERROR ||
coordJob.getStatus() == Job.Status.PAUSEDWITHERROR) {
coordJob.setStatus(Job.Status.SUSPENDEDWITHERROR);
}
else if (coordJob.getStatus() == Job.Status.PAUSED) {
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSuspendXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSuspendXCommand.java?rev=1477360&r1=1477359&r2=1477360&view=diff
==============================================================================
---
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSuspendXCommand.java
(original)
+++
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSuspendXCommand.java
Mon Apr 29 21:44:51 2013
@@ -86,6 +86,24 @@ public class TestCoordSuspendXCommand ex
}
/**
+ * Test : suspend a PAUSEDWITHERROR coordinator job
+ *
+ * @throws Exception
+ */
+ public void testCoordSuspendWithErrorPostive2() throws Exception {
+ CoordinatorJobBean job =
addRecordToCoordJobTable(CoordinatorJob.Status.PAUSEDWITHERROR, false, false);
+
+ JPAService jpaService = Services.get().get(JPAService.class);
+ assertNotNull(jpaService);
+ CoordJobGetJPAExecutor coordJobGetCmd = new
CoordJobGetJPAExecutor(job.getId());
+ job = jpaService.execute(coordJobGetCmd);
+ assertEquals(job.getStatus(), CoordinatorJob.Status.PAUSEDWITHERROR);
+
+ new CoordSuspendXCommand(job.getId()).call();
+ job = jpaService.execute(coordJobGetCmd);
+ assertEquals(job.getStatus(),
CoordinatorJob.Status.SUSPENDEDWITHERROR);
+ }
+ /**
* Negative Test : suspend a SUCCEEDED coordinator job
*
* @throws Exception
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1477360&r1=1477359&r2=1477360&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Apr 29 21:44:51 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1351 Oozie jobs with state PAUSEDWITHERROR should change to
SUSPENDEDWITHERROR state when suspended (bowenzhangusa via virag)
OOZIE-1346 Modularize hbase credentials to separate the populating of jobconf
and obtaining token for job (virag)
OOZIE-1341 Have Action Main classes in Oozie webapp (virag)
OOZIE-1337 HadoopAccessorService has two static methods so you can't override
them with another implementation (rkanter)
