Author: rohini
Date: Fri Aug 23 15:34:38 2013
New Revision: 1516892
URL: http://svn.apache.org/r1516892
Log:
OOZIE-1507 Command queue filling up with duplicate commands from
RecoveryService (rohini)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordResumeXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionKillXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/KillXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java?rev=1516892&r1=1516891&r2=1516892&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java
Fri Aug 23 15:34:38 2013
@@ -24,7 +24,6 @@ import org.apache.oozie.BundleActionBean
import org.apache.oozie.BundleJobBean;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.XException;
-import org.apache.oozie.client.CoordinatorJob;
import org.apache.oozie.client.Job;
import org.apache.oozie.command.CommandException;
import org.apache.oozie.command.KillTransitionXCommand;
@@ -58,6 +57,11 @@ public class BundleKillXCommand extends
return jobId;
}
+ @Override
+ public String getKey() {
+ return getName() + "_" + jobId;
+ }
+
/* (non-Javadoc)
* @see org.apache.oozie.command.XCommand#isLockRequired()
*/
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java?rev=1516892&r1=1516891&r2=1516892&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleStartXCommand.java
Fri Aug 23 15:34:38 2013
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -89,6 +89,11 @@ public class BundleStartXCommand extends
return jobId;
}
+ @Override
+ public String getKey() {
+ return getName() + "_" + jobId;
+ }
+
/* (non-Javadoc)
* @see org.apache.oozie.command.XCommand#isLockRequired()
*/
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=1516892&r1=1516891&r2=1516892&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
Fri Aug 23 15:34:38 2013
@@ -69,6 +69,11 @@ public class CoordKillXCommand extends K
}
@Override
+ public String getKey() {
+ return getName() + "_" + this.jobId;
+ }
+
+ @Override
protected void loadState() throws CommandException {
try {
jpaService = Services.get().get(JPAService.class);
@@ -168,9 +173,6 @@ public class CoordKillXCommand extends K
updateList.add(coordJob);
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.KillTransitionXCommand#performWrites()
- */
@Override
public void performWrites() throws CommandException {
try {
@@ -181,9 +183,6 @@ public class CoordKillXCommand extends K
}
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.TransitionXCommand#getJob()
- */
@Override
public Job getJob() {
return coordJob;
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordResumeXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordResumeXCommand.java?rev=1516892&r1=1516891&r2=1516892&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordResumeXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordResumeXCommand.java
Fri Aug 23 15:34:38 2013
@@ -26,7 +26,6 @@ import org.apache.oozie.ErrorCode;
import org.apache.oozie.XException;
import org.apache.oozie.client.CoordinatorJob;
import org.apache.oozie.client.Job;
-import org.apache.oozie.client.rest.JsonBean;
import org.apache.oozie.command.CommandException;
import org.apache.oozie.command.PreconditionException;
import org.apache.oozie.command.ResumeTransitionXCommand;
@@ -36,7 +35,6 @@ import org.apache.oozie.executor.jpa.Bul
import org.apache.oozie.executor.jpa.CoordJobGetActionsSuspendedJPAExecutor;
import org.apache.oozie.executor.jpa.CoordJobGetJPAExecutor;
import org.apache.oozie.executor.jpa.JPAExecutorException;
-import org.apache.oozie.service.EventHandlerService;
import org.apache.oozie.service.JPAService;
import org.apache.oozie.service.Services;
import org.apache.oozie.util.InstrumentUtils;
@@ -59,25 +57,21 @@ public class CoordResumeXCommand extends
this.jobId = ParamChecker.notEmpty(id, "id");
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#getEntityKey()
- */
@Override
public String getEntityKey() {
return jobId;
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#isLockRequired()
- */
+ @Override
+ public String getKey() {
+ return getName() + "_" + this.jobId;
+ }
+
@Override
protected boolean isLockRequired() {
return true;
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#loadState()
- */
@Override
protected void loadState() throws CommandException {
jpaService = Services.get().get(JPAService.class);
@@ -95,9 +89,6 @@ public class CoordResumeXCommand extends
LogUtils.setLogInfo(coordJob, logInfo);
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#verifyPrecondition()
- */
@Override
protected void verifyPrecondition() throws CommandException,
PreconditionException {
if (coordJob.getStatus() != CoordinatorJob.Status.SUSPENDED &&
coordJob.getStatus() != CoordinatorJob.Status.SUSPENDEDWITHERROR &&
coordJob.getStatus() != Job.Status.PREPSUSPENDED) {
@@ -106,9 +97,6 @@ public class CoordResumeXCommand extends
}
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.TransitionXCommand#updateJob()
- */
@Override
public void updateJob() {
InstrumentUtils.incrJobCounter(getName(), 1, getInstrumentation());
@@ -119,9 +107,6 @@ public class CoordResumeXCommand extends
updateList.add(coordJob);
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.ResumeTransitionXCommand#resumeChildren()
- */
@Override
public void resumeChildren() throws CommandException {
try {
@@ -162,9 +147,6 @@ public class CoordResumeXCommand extends
}
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.TransitionXCommand#notifyParent()
- */
@Override
public void notifyParent() throws CommandException {
// update bundle action
@@ -174,9 +156,6 @@ public class CoordResumeXCommand extends
}
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.ResumeTransitionXCommand#performWrites()
- */
@Override
public void performWrites() throws CommandException {
try {
@@ -194,9 +173,6 @@ public class CoordResumeXCommand extends
updateList.add(action);
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.TransitionXCommand#getJob()
- */
@Override
public Job getJob() {
return coordJob;
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java?rev=1516892&r1=1516891&r2=1516892&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendXCommand.java
Fri Aug 23 15:34:38 2013
@@ -35,7 +35,6 @@ import org.apache.oozie.executor.jpa.Bul
import org.apache.oozie.executor.jpa.CoordJobGetActionsRunningJPAExecutor;
import org.apache.oozie.executor.jpa.CoordJobGetJPAExecutor;
import org.apache.oozie.executor.jpa.JPAExecutorException;
-import org.apache.oozie.service.EventHandlerService;
import org.apache.oozie.service.JPAService;
import org.apache.oozie.service.Services;
import org.apache.oozie.util.InstrumentUtils;
@@ -59,25 +58,21 @@ public class CoordSuspendXCommand extend
this.jobId = ParamChecker.notEmpty(id, "id");
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#getEntityKey()
- */
@Override
public String getEntityKey() {
return jobId;
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#isLockRequired()
- */
+ @Override
+ public String getKey() {
+ return getName() + "_" + jobId;
+ }
+
@Override
protected boolean isLockRequired() {
return true;
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#loadState()
- */
@Override
protected void loadState() throws CommandException {
super.eagerLoadState();
@@ -97,9 +92,6 @@ public class CoordSuspendXCommand extend
LogUtils.setLogInfo(this.coordJob, logInfo);
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#verifyPrecondition()
- */
@Override
protected void verifyPrecondition() throws CommandException,
PreconditionException {
super.eagerVerifyPrecondition();
@@ -112,9 +104,6 @@ public class CoordSuspendXCommand extend
}
}
- /* (non-Javadoc)
- * @see
org.apache.oozie.command.SuspendTransitionXCommand#suspendChildren()
- */
@Override
public void suspendChildren() throws CommandException {
try {
@@ -155,9 +144,6 @@ public class CoordSuspendXCommand extend
}
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.TransitionXCommand#notifyParent()
- */
@Override
public void notifyParent() throws CommandException {
// update bundle action
@@ -167,9 +153,6 @@ public class CoordSuspendXCommand extend
}
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.TransitionXCommand#updateJob()
- */
@Override
public void updateJob() {
InstrumentUtils.incrJobCounter(getName(), 1, getInstrumentation());
@@ -179,9 +162,6 @@ public class CoordSuspendXCommand extend
updateList.add(coordJob);
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.SuspendTransitionXCommand#performWrites()
- */
@Override
public void performWrites() throws CommandException {
try {
@@ -199,9 +179,6 @@ public class CoordSuspendXCommand extend
updateList.add(action);
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.TransitionXCommand#getJob()
- */
@Override
public Job getJob() {
return coordJob;
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionKillXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionKillXCommand.java?rev=1516892&r1=1516891&r2=1516892&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionKillXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionKillXCommand.java
Fri Aug 23 15:34:38 2013
@@ -82,6 +82,11 @@ public class ActionKillXCommand extends
}
@Override
+ public String getKey() {
+ return getName() + "_" + this.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/KillXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/KillXCommand.java?rev=1516892&r1=1516891&r2=1516892&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/KillXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/KillXCommand.java
Fri Aug 23 15:34:38 2013
@@ -80,6 +80,11 @@ public class KillXCommand extends Workfl
}
@Override
+ public String getKey() {
+ return getName() + "_" + this.wfId;
+ }
+
+ @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/ResumeXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java?rev=1516892&r1=1516891&r2=1516892&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ResumeXCommand.java
Fri Aug 23 15:34:38 2013
@@ -35,7 +35,6 @@ import org.apache.oozie.client.WorkflowJ
import org.apache.oozie.client.rest.JsonBean;
import org.apache.oozie.command.CommandException;
import org.apache.oozie.command.PreconditionException;
-import org.apache.oozie.command.coord.CoordActionUpdateXCommand;
import org.apache.oozie.command.wf.ActionXCommand.ActionExecutorContext;
import org.apache.oozie.executor.jpa.BulkUpdateInsertJPAExecutor;
import org.apache.oozie.executor.jpa.JPAExecutorException;
@@ -163,6 +162,11 @@ public class ResumeXCommand extends Work
}
@Override
+ public String getKey() {
+ return getName() + "_" + id;
+ }
+
+ @Override
protected boolean isLockRequired() {
return true;
}
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java?rev=1516892&r1=1516891&r2=1516892&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SuspendXCommand.java
Fri Aug 23 15:34:38 2013
@@ -53,9 +53,6 @@ public class SuspendXCommand extends Wor
this.wfid = ParamChecker.notEmpty(id, "wfid");
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#execute()
- */
@Override
protected Void execute() throws CommandException {
InstrumentUtils.incrJobCounter(getName(), 1, getInstrumentation());
@@ -140,9 +137,6 @@ public class SuspendXCommand extends Wor
}
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#eagerLoadState()
- */
@Override
protected void eagerLoadState() throws CommandException {
super.eagerLoadState();
@@ -161,9 +155,6 @@ public class SuspendXCommand extends Wor
LogUtils.setLogInfo(this.wfJobBean, logInfo);
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#eagerVerifyPrecondition()
- */
@Override
protected void eagerVerifyPrecondition() throws CommandException,
PreconditionException {
super.eagerVerifyPrecondition();
@@ -172,33 +163,26 @@ public class SuspendXCommand extends Wor
}
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#getEntityKey()
- */
@Override
public String getEntityKey() {
return this.wfid;
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#isLockRequired()
- */
+ @Override
+ public String getKey() {
+ return getName() + "_" + this.wfid;
+ }
+
@Override
protected boolean isLockRequired() {
return true;
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#loadState()
- */
@Override
protected void loadState() throws CommandException {
eagerLoadState();
}
- /* (non-Javadoc)
- * @see org.apache.oozie.command.XCommand#verifyPrecondition()
- */
@Override
protected void verifyPrecondition() throws CommandException,
PreconditionException {
eagerVerifyPrecondition();
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1516892&r1=1516891&r2=1516892&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Aug 23 15:34:38 2013
@@ -16,6 +16,7 @@ OOZIE-1440 Build fails in certain enviro
-- Oozie 4.0.0 release
+OOZIE-1507 Command queue filling up with duplicate commands from
RecoveryService (rohini)
OOZIE-1502 Coordinator Job not going to Failed if a bad HCat-uri is specified
(mona)
OOZIE-1501 Mapreduce action counters are picked up from launcher job instead
of mapreduce job (rohini)
OOZIE-1405 Fix flakey SLA tests (mona)
