OOZIE-1473 getKey() not overridden in some commands causing duplicate…

…s in queue
shwethags · Jan 28, 2014 · f60ae54 · f60ae54
1 parent fee10db
commit f60ae54
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java
@@ -132,6 +132,11 @@ public String getEntityKey() {
         return actionId;
     }
 
+    @Override
+    public String getKey() {
+        return getName() + "_" + actionId;
+    }
+
     /* (non-Javadoc)
      * @see org.apache.oozie.command.XCommand#isLockRequired()
      */

diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyXCommand.java
@@ -131,6 +131,11 @@ public String getEntityKey() {
         return jobId;
     }
 
+    @Override
+    public String getKey() {
+        return getName() + "_" + jobId;
+    }
+
     @Override
     protected boolean isLockRequired() {
         return true;

diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOutXCommand.java
@@ -72,6 +72,11 @@ public String getEntityKey() {
         return actionBean.getJobId();
     }
 
+    @Override
+    public String getKey() {
+        return getName() + "_" + actionBean.getId();
+    }
+
     /* (non-Javadoc)
      * @see org.apache.oozie.command.XCommand#isLockRequired()
      */

diff --git a/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java
@@ -82,6 +82,11 @@ public String getEntityKey() {
         return this.jobId;
     }
 
+    @Override
+    public String getKey() {
+        return getName() + "_" + actionId;
+    }
+
     @Override
     protected void loadState() throws CommandException {
         try {

diff --git a/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
@@ -94,6 +94,11 @@ public String getEntityKey() {
         return this.jobId;
     }
 
+    @Override
+    public String getKey() {
+        return getName() + "_" + jobId + "_" + actionId;
+    }
+
     @Override
     protected void loadState() throws CommandException {
         try {