Author: virag
Date: Sat Jun 29 01:52:36 2013
New Revision: 1497972
URL: http://svn.apache.org/r1497972
Log:
OOZIE-1439 Job materialization happening even after coordinator is supposed to
be killed (virag)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java?rev=1497972&r1=1497971&r2=1497972&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
Sat Jun 29 01:52:36 2013
@@ -142,7 +142,7 @@ public class CoordKillXCommand extends K
}
}
}
-
+ coordJob.setDoneMaterialization();
updateList.add(coordJob);
LOG.debug("Killed coord actions for the coordinator=[{0}]", jobId);
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java?rev=1497972&r1=1497971&r2=1497972&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
Sat Jun 29 01:52:36 2013
@@ -206,6 +206,11 @@ public class CoordMaterializeTransitionX
+ " job is not in PREP or RUNNING but in " +
coordJob.getStatus());
}
+ if (coordJob.isDoneMaterialization()) {
+ throw new PreconditionException(ErrorCode.E1100,
"CoordMaterializeTransitionXCommand for jobId =" + jobId
+ + " job is already materialized");
+ }
+
if (coordJob.getNextMaterializedTimestamp() != null
&&
coordJob.getNextMaterializedTimestamp().compareTo(coordJob.getEndTimestamp())
>= 0) {
throw new PreconditionException(ErrorCode.E1100,
"CoordMaterializeTransitionXCommand for jobId=" + jobId
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java?rev=1497972&r1=1497971&r2=1497972&view=diff
==============================================================================
---
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java
(original)
+++
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java
Sat Jun 29 01:52:36 2013
@@ -78,7 +78,7 @@ public class TestCoordKillXCommand exten
Date start = DateUtils.parseDateOozieTZ(currentDatePlusMonth);
Date end = DateUtils.parseDateOozieTZ(currentDatePlusMonth);
- CoordinatorJobBean job =
addRecordToCoordJobTable(CoordinatorJob.Status.RUNNING, start, end, false,
true, 0);
+ CoordinatorJobBean job =
addRecordToCoordJobTable(CoordinatorJob.Status.RUNNING, start, end, false,
false, 0);
CoordinatorActionBean action =
addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.READY,
"coord-action-get.xml", 0);
JPAService jpaService = Services.get().get(JPAService.class);
@@ -90,12 +90,14 @@ public class TestCoordKillXCommand exten
action = jpaService.execute(coordActionGetCmd);
assertEquals(job.getStatus(), CoordinatorJob.Status.RUNNING);
assertEquals(action.getStatus(), CoordinatorAction.Status.READY);
+ assertFalse(job.isDoneMaterialization());
new CoordKillXCommand(job.getId()).call();
job = jpaService.execute(coordJobGetCmd);
action = jpaService.execute(coordActionGetCmd);
assertEquals(job.getStatus(), CoordinatorJob.Status.KILLED);
+ assertTrue(job.isDoneMaterialization());
assertEquals(action.getStatus(), CoordinatorAction.Status.KILLED);
}
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1497972&r1=1497971&r2=1497972&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Sat Jun 29 01:52:36 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1439 Job materialization happening even after coordinator is supposed to
be killed (virag)
OOZIE-1438 parentID is null in job event message of subworkflow action (ryota)
OOZIE-1435 StatusTransitService unnecessarily updates the lastModifiedTime of
jobs which causes MaterializationService to bring same jobs in memory (virag)
OOZIE-1433 ActionCheckX should override XCommand.getKey() to prevent
duplicates (virag)
