svn commit: r1508128 - in /oozie/trunk: ./ core/src/main/java/org/apache/oozie/command/coord/ core/src/main/java/org/apache/oozie/command/wf/

[virag]

Author: virag
Date: Mon Jul 29 16:42:48 2013
New Revision: 1508128

URL: http://svn.apache.org/r1508128
Log:
OOZIE-1473 getKey() not overridden in some commands causing duplicates in queue 
(virag)

Modified:
    
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
    
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
    
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
    
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
    
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
    oozie/trunk/release-log.txt

Modified: 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java?rev=1508128&r1=1508127&r2=1508128&view=diff
==============================================================================
--- 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
 (original)
+++ 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
 Mon Jul 29 16:42:48 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/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java?rev=1508128&r1=1508127&r2=1508128&view=diff
==============================================================================
--- 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
 (original)
+++ 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
 Mon Jul 29 16:42:48 2013
@@ -132,6 +132,11 @@ public class CoordActionReadyXCommand ex
     }
 
     @Override
+    public String getKey() {
+        return getName() + "_" + jobId;
+    }
+
+    @Override
     protected boolean isLockRequired() {
         return true;
     }

Modified: 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java?rev=1508128&r1=1508127&r2=1508128&view=diff
==============================================================================
--- 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
 (original)
+++ 
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
 Mon Jul 29 16:42:48 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/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java?rev=1508128&r1=1508127&r2=1508128&view=diff
==============================================================================
--- 
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
 (original)
+++ 
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
 Mon Jul 29 16:42:48 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/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java?rev=1508128&r1=1508127&r2=1508128&view=diff
==============================================================================
--- 
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java 
(original)
+++ 
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java 
Mon Jul 29 16:42:48 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/trunk/release-log.txt
URL: 
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1508128&r1=1508127&r2=1508128&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Jul 29 16:42:48 2013
@@ -7,6 +7,7 @@ OOZIE-1440 Build fails in certain enviro
 
 -- 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)