Author: virag
Date: Mon Jul 29 16:46:54 2013
New Revision: 1508131
URL: http://svn.apache.org/r1508131
Log:
OOZIE-1473 getKey() not overridden in some commands causing duplicates in queue
(virag)
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
oozie/branches/branch-4.0/release-log.txt
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java?rev=1508131&r1=1508130&r2=1508131&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
Mon Jul 29 16:46:54 2013
@@ -144,6 +144,11 @@ public class CoordActionCheckXCommand ex
return actionId;
}
+ @Override
+ public String getKey() {
+ return getName() + "_" + actionId;
+ }
+
/* (non-Javadoc)
* @see org.apache.oozie.command.XCommand#isLockRequired()
*/
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java?rev=1508131&r1=1508130&r2=1508131&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
Mon Jul 29 16:46:54 2013
@@ -132,6 +132,11 @@ public class CoordActionReadyXCommand ex
}
@Override
+ public String getKey() {
+ return getName() + "_" + jobId;
+ }
+
+ @Override
protected boolean isLockRequired() {
return true;
}
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java?rev=1508131&r1=1508130&r2=1508131&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
Mon Jul 29 16:46:54 2013
@@ -78,6 +78,11 @@ public class CoordActionTimeOutXCommand
return actionBean.getJobId();
}
+ @Override
+ public String getKey() {
+ return getName() + "_" + actionBean.getId();
+ }
+
/* (non-Javadoc)
* @see org.apache.oozie.command.XCommand#isLockRequired()
*/
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java?rev=1508131&r1=1508130&r2=1508131&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
Mon Jul 29 16:46:54 2013
@@ -85,6 +85,11 @@ public class ActionEndXCommand extends A
}
@Override
+ public String getKey() {
+ return getName() + "_" + actionId;
+ }
+
+ @Override
protected void loadState() throws CommandException {
try {
jpaService = Services.get().get(JPAService.class);
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java?rev=1508131&r1=1508130&r2=1508131&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
Mon Jul 29 16:46:54 2013
@@ -99,6 +99,11 @@ public class SignalXCommand extends Work
}
@Override
+ public String getKey() {
+ return getName() + "_" + jobId + "_" + actionId;
+ }
+
+ @Override
protected void loadState() throws CommandException {
try {
jpaService = Services.get().get(JPAService.class);
Modified: oozie/branches/branch-4.0/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1508131&r1=1508130&r2=1508131&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Mon Jul 29 16:46:54 2013
@@ -1,5 +1,6 @@
-- Oozie 4.0.0 release
+OOZIE-1473 getKey() not overridden in some commands causing duplicates in
queue (virag)
OOZIE-1470 BundleStatusUpdateXCommand should get lock for bundle job (virag)
OOZIE-1469 loadState() and/or verifyPrecondition() are blank in some commands
(virag)
OOZIE-1467 Bundle not killed if coordinator fails due to db exception
(rohini,virag via virag)
