Author: kamrul
Date: Wed May 2 07:07:45 2012
New Revision: 1332935
URL: http://svn.apache.org/viewvc?rev=1332935&view=rev
Log:
OOZIE-826: TestCoordKillXCommand's testCoordKillXCommandUniqueness testcase is
failing after interrupt changes(virag via Mohammad)
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java
incubator/oozie/trunk/release-log.txt
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java?rev=1332935&r1=1332934&r2=1332935&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
Wed May 2 07:07:45 2012
@@ -94,8 +94,9 @@ public class CoordKillXCommand extends K
}
if (coordJob.getStatus() == CoordinatorJob.Status.SUCCEEDED
|| coordJob.getStatus() == CoordinatorJob.Status.FAILED
- || coordJob.getStatus() ==
CoordinatorJob.Status.DONEWITHERROR) {
- LOG.info("CoordKillXCommand not killed - job either finished
SUCCEEDED, FAILED or DONEWITHERROR, job id = "
+ || coordJob.getStatus() == CoordinatorJob.Status.DONEWITHERROR
+ || coordJob.getStatus() == CoordinatorJob.Status.KILLED) {
+ LOG.info("CoordKillXCommand not killed - job either finished
SUCCEEDED, FAILED, KILLED or DONEWITHERROR, job id = "
+ jobId + ", status = " + coordJob.getStatus());
throw new PreconditionException(ErrorCode.E1020, jobId);
}
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java?rev=1332935&r1=1332934&r2=1332935&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java
Wed May 2 07:07:45 2012
@@ -273,6 +273,7 @@ public class TestCoordKillXCommand exten
@Override
protected Void execute() throws CommandException {
+ super.execute();
try {
Thread.sleep(wait);
}
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1332935&r1=1332934&r2=1332935&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Wed May 2 07:07:45 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-826: TestCoordKillXCommand's testCoordKillXCommandUniqueness testcase is
failing after interrupt changes(virag via Mohammad)
OOZIE-819: Interrupt map doesn't have unique set of commands for a given
jobid(virag via Mohammad)
OOZIE-810 Modify Oozie POM to pickup doxia 9.2y from a repo where it is
avail(tucu via Mohammad)
OOZIE-241 EL function(s) to expose action output data as a (XML/JSON/PROP)
blob (tucu)
