You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2012/03/07 17:02:57 UTC
svn commit: r1298003 - in /incubator/oozie/trunk: ./
core/src/main/java/org/apache/oozie/
core/src/main/java/org/apache/oozie/command/coord/
core/src/main/java/org/apache/oozie/command/wf/
core/src/main/java/org/apache/oozie/service/ core/src/main/java...
Author: tucu
Date: Wed Mar 7 16:02:55 2012
New Revision: 1298003
URL: http://svn.apache.org/viewvc?rev=1298003&view=rev
Log:
OOZIE-723 Getting rid of the unused Commands classes (mohamed via tucu)
Removed:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInfoCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionNotification.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionReadyCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionTimeOut.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdateCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordChangeCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordJobCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordJobMatLookupCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordJobsCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPurgeCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordRecoveryCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordRerunCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordResumeCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSuspendCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/SLAEventsCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionCheckCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionEndCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionKillCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionStartCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/CompletedActionCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/DefinitionCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ExternalIdCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/JobCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/JobsCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/KillCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/NotificationCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/PurgeCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ResumeCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/StartCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitHttpCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitMRCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitPigCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SuspendCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/WorkflowActionInfoCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/WorkflowCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheck.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionReadyCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordJobMatLookupCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordPurgeCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitMRCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestSubmitPigCommand.java
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/ActionCheckerService.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/PurgeService.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/SLAServlet.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/TestActionFailover.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/BaseEngine.java Wed Mar 7 16:02:55 2012
@@ -19,38 +19,10 @@ package org.apache.oozie;
import java.io.IOException;
import java.io.Writer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.client.CoordinatorJob;
-import org.apache.oozie.client.OozieClient;
import org.apache.oozie.client.WorkflowJob;
-import org.apache.oozie.command.CommandException;
-import org.apache.oozie.command.wf.CompletedActionCommand;
-import org.apache.oozie.command.wf.DefinitionCommand;
-import org.apache.oozie.command.wf.ExternalIdCommand;
-import org.apache.oozie.command.wf.JobCommand;
-import org.apache.oozie.command.wf.JobsCommand;
-import org.apache.oozie.command.wf.KillCommand;
-import org.apache.oozie.command.wf.ReRunCommand;
-import org.apache.oozie.command.wf.ResumeCommand;
-import org.apache.oozie.command.wf.StartCommand;
-import org.apache.oozie.command.wf.SubmitCommand;
-import org.apache.oozie.command.wf.SuspendCommand;
-import org.apache.oozie.service.DagXLogInfoService;
-import org.apache.oozie.service.Service;
-import org.apache.oozie.service.Services;
-import org.apache.oozie.service.XLogService;
-import org.apache.oozie.util.ParamChecker;
-import org.apache.oozie.util.XLog;
-import org.apache.oozie.util.XLogStreamer;
public abstract class BaseEngine {
public static final String USE_XCOMMAND = "oozie.useXCommand";
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorEngine.java Wed Mar 7 16:02:55 2012
@@ -35,24 +35,15 @@ import org.apache.oozie.client.OozieClie
import org.apache.oozie.client.WorkflowJob;
import org.apache.oozie.client.rest.RestConstants;
import org.apache.oozie.command.CommandException;
-import org.apache.oozie.command.coord.CoordActionInfoCommand;
import org.apache.oozie.command.coord.CoordActionInfoXCommand;
import org.apache.oozie.util.CoordActionsInDateRange;
-import org.apache.oozie.command.coord.CoordChangeCommand;
import org.apache.oozie.command.coord.CoordChangeXCommand;
-import org.apache.oozie.command.coord.CoordJobCommand;
import org.apache.oozie.command.coord.CoordJobXCommand;
-import org.apache.oozie.command.coord.CoordJobsCommand;
import org.apache.oozie.command.coord.CoordJobsXCommand;
-import org.apache.oozie.command.coord.CoordKillCommand;
import org.apache.oozie.command.coord.CoordKillXCommand;
-import org.apache.oozie.command.coord.CoordRerunCommand;
import org.apache.oozie.command.coord.CoordRerunXCommand;
-import org.apache.oozie.command.coord.CoordResumeCommand;
import org.apache.oozie.command.coord.CoordResumeXCommand;
-import org.apache.oozie.command.coord.CoordSubmitCommand;
import org.apache.oozie.command.coord.CoordSubmitXCommand;
-import org.apache.oozie.command.coord.CoordSuspendCommand;
import org.apache.oozie.command.coord.CoordSuspendXCommand;
import org.apache.oozie.service.DagXLogInfoService;
import org.apache.oozie.service.Services;
@@ -62,7 +53,6 @@ import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XLogStreamer;
public class CoordinatorEngine extends BaseEngine {
- private static boolean useXCommand = true;
private static XLog LOG = XLog.getLog(CoordinatorEngine.class);
/**
@@ -70,7 +60,6 @@ public class CoordinatorEngine extends B
*/
public CoordinatorEngine() {
if (Services.get().getConf().getBoolean(USE_XCOMMAND, true) == false) {
- useXCommand = false;
LOG.debug("Oozie CoordinatorEngine is not using XCommands.");
}
else {
@@ -108,12 +97,7 @@ public class CoordinatorEngine extends B
*/
private CoordinatorJobBean getCoordJobWithNoActionInfo(String jobId) throws BaseEngineException {
try {
- if (useXCommand) {
- return new CoordJobXCommand(jobId).call();
- }
- else {
- return new CoordJobCommand(jobId).call();
- }
+ return new CoordJobXCommand(jobId).call();
}
catch (CommandException ex) {
throw new BaseEngineException(ex);
@@ -127,12 +111,7 @@ public class CoordinatorEngine extends B
*/
public CoordinatorActionBean getCoordAction(String actionId) throws BaseEngineException {
try {
- if (useXCommand) {
- return new CoordActionInfoXCommand(actionId).call();
- }
- else {
- return new CoordActionInfoCommand(actionId).call();
- }
+ return new CoordActionInfoXCommand(actionId).call();
}
catch (CommandException ex) {
throw new BaseEngineException(ex);
@@ -147,12 +126,7 @@ public class CoordinatorEngine extends B
@Override
public CoordinatorJobBean getCoordJob(String jobId) throws BaseEngineException {
try {
- if (useXCommand) {
- return new CoordJobXCommand(jobId).call();
- }
- else {
- return new CoordJobCommand(jobId).call();
- }
+ return new CoordJobXCommand(jobId).call();
}
catch (CommandException ex) {
throw new BaseEngineException(ex);
@@ -168,12 +142,8 @@ public class CoordinatorEngine extends B
public CoordinatorJobBean getCoordJob(String jobId, String filter, int start, int length) throws BaseEngineException {
List<String> filterList = parseStatusFilter(filter);
try {
- if (useXCommand) {
- return new CoordJobXCommand(jobId, filterList, start, length).call();
- }
- else {
- return new CoordJobCommand(jobId, start, length).call();
- }
+ return new CoordJobXCommand(jobId, filterList, start, length)
+ .call();
}
catch (CommandException ex) {
throw new BaseEngineException(ex);
@@ -198,12 +168,7 @@ public class CoordinatorEngine extends B
@Override
public void kill(String jobId) throws CoordinatorEngineException {
try {
- if (useXCommand) {
- new CoordKillXCommand(jobId).call();
- }
- else {
- new CoordKillCommand(jobId).call();
- }
+ new CoordKillXCommand(jobId).call();
LOG.info("User " + user + " killed the Coordinator job " + jobId);
}
catch (CommandException e) {
@@ -217,12 +182,7 @@ public class CoordinatorEngine extends B
@Override
public void change(String jobId, String changeValue) throws CoordinatorEngineException {
try {
- if (useXCommand) {
- new CoordChangeXCommand(jobId, changeValue).call();
- }
- else {
- new CoordChangeCommand(jobId, changeValue).call();
- }
+ new CoordChangeXCommand(jobId, changeValue).call();
LOG.info("User " + user + " changed the Coordinator job " + jobId + " to " + changeValue);
}
catch (CommandException e) {
@@ -249,12 +209,8 @@ public class CoordinatorEngine extends B
public CoordinatorActionInfo reRun(String jobId, String rerunType, String scope, boolean refresh, boolean noCleanup)
throws BaseEngineException {
try {
- if (useXCommand) {
- return new CoordRerunXCommand(jobId, rerunType, scope, refresh, noCleanup).call();
- }
- else {
- return new CoordRerunCommand(jobId, rerunType, scope, refresh, noCleanup).call();
- }
+ return new CoordRerunXCommand(jobId, rerunType, scope, refresh,
+ noCleanup).call();
}
catch (CommandException ex) {
throw new BaseEngineException(ex);
@@ -269,12 +225,7 @@ public class CoordinatorEngine extends B
@Override
public void resume(String jobId) throws CoordinatorEngineException {
try {
- if (useXCommand) {
- new CoordResumeXCommand(jobId).call();
- }
- else {
- new CoordResumeCommand(jobId).call();
- }
+ new CoordResumeXCommand(jobId).call();
}
catch (CommandException e) {
throw new CoordinatorEngineException(e);
@@ -415,16 +366,9 @@ public class CoordinatorEngine extends B
@Override
public String submitJob(Configuration conf, boolean startJob) throws CoordinatorEngineException {
try {
- String jobId;
- if (useXCommand) {
- CoordSubmitXCommand submit = new CoordSubmitXCommand(conf, getAuthToken());
- jobId = submit.call();
- }
- else {
- CoordSubmitCommand submit = new CoordSubmitCommand(conf, getAuthToken());
- jobId = submit.call();
- }
- return jobId;
+ CoordSubmitXCommand submit = new CoordSubmitXCommand(conf,
+ getAuthToken());
+ return submit.call();
}
catch (CommandException ex) {
throw new CoordinatorEngineException(ex);
@@ -441,16 +385,9 @@ public class CoordinatorEngine extends B
@Override
public String dryrunSubmit(Configuration conf, boolean startJob) throws CoordinatorEngineException {
try {
- String jobId;
- if (useXCommand) {
- CoordSubmitXCommand submit = new CoordSubmitXCommand(true, conf, getAuthToken());
- jobId = submit.call();
- }
- else {
- CoordSubmitCommand submit = new CoordSubmitCommand(true, conf, getAuthToken());
- jobId = submit.call();
- }
- return jobId;
+ CoordSubmitXCommand submit = new CoordSubmitXCommand(true, conf,
+ getAuthToken());
+ return submit.call();
}
catch (CommandException ex) {
throw new CoordinatorEngineException(ex);
@@ -465,12 +402,7 @@ public class CoordinatorEngine extends B
@Override
public void suspend(String jobId) throws CoordinatorEngineException {
try {
- if (useXCommand) {
- new CoordSuspendXCommand(jobId).call();
- }
- else {
- new CoordSuspendCommand(jobId).call();
- }
+ new CoordSuspendXCommand(jobId).call();
}
catch (CommandException e) {
throw new CoordinatorEngineException(e);
@@ -521,12 +453,7 @@ public class CoordinatorEngine extends B
Map<String, List<String>> filterList = parseFilter(filter);
try {
- if (useXCommand) {
- return new CoordJobsXCommand(filterList, start, len).call();
- }
- else {
- return new CoordJobsCommand(filterList, start, len).call();
- }
+ return new CoordJobsXCommand(filterList, start, len).call();
}
catch (CommandException ex) {
throw new CoordinatorEngineException(ex);
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/DagEngine.java Wed Mar 7 16:02:55 2012
@@ -25,36 +25,20 @@ import org.apache.oozie.client.Coordinat
import org.apache.oozie.client.WorkflowJob;
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.command.CommandException;
-import org.apache.oozie.command.XCommand;
-import org.apache.oozie.command.wf.CompletedActionCommand;
import org.apache.oozie.command.wf.CompletedActionXCommand;
-import org.apache.oozie.command.wf.DefinitionCommand;
import org.apache.oozie.command.wf.DefinitionXCommand;
-import org.apache.oozie.command.wf.ExternalIdCommand;
import org.apache.oozie.command.wf.ExternalIdXCommand;
-import org.apache.oozie.command.wf.JobCommand;
import org.apache.oozie.command.wf.JobXCommand;
-import org.apache.oozie.command.wf.JobsCommand;
import org.apache.oozie.command.wf.JobsXCommand;
-import org.apache.oozie.command.wf.KillCommand;
import org.apache.oozie.command.wf.KillXCommand;
-import org.apache.oozie.command.wf.ReRunCommand;
import org.apache.oozie.command.wf.ReRunXCommand;
-import org.apache.oozie.command.wf.ResumeCommand;
import org.apache.oozie.command.wf.ResumeXCommand;
-import org.apache.oozie.command.wf.StartCommand;
import org.apache.oozie.command.wf.StartXCommand;
-import org.apache.oozie.command.wf.SubmitCommand;
-import org.apache.oozie.command.wf.SubmitHttpCommand;
import org.apache.oozie.command.wf.SubmitHttpXCommand;
-import org.apache.oozie.command.wf.SubmitMRCommand;
import org.apache.oozie.command.wf.SubmitMRXCommand;
-import org.apache.oozie.command.wf.SubmitPigCommand;
import org.apache.oozie.command.wf.SubmitPigXCommand;
import org.apache.oozie.command.wf.SubmitXCommand;
-import org.apache.oozie.command.wf.SuspendCommand;
import org.apache.oozie.command.wf.SuspendXCommand;
-import org.apache.oozie.command.wf.WorkflowActionInfoCommand;
import org.apache.oozie.command.wf.WorkflowActionInfoXCommand;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.CallableQueueService;
@@ -80,7 +64,6 @@ import java.io.IOException;
public class DagEngine extends BaseEngine {
private static final int HIGH_PRIORITY = 2;
- private boolean useXCommand = true;
private static XLog LOG = XLog.getLog(DagEngine.class);
/**
@@ -88,7 +71,6 @@ public class DagEngine extends BaseEngin
*/
public DagEngine() {
if (Services.get().getConf().getBoolean(USE_XCOMMAND, true) == false) {
- useXCommand = false;
LOG.debug("Oozie DagEngine is not using XCommands.");
}
else {
@@ -122,19 +104,13 @@ public class DagEngine extends BaseEngin
validateSubmitConfiguration(conf);
try {
- String jobId;
- if (useXCommand) {
- SubmitXCommand submit = new SubmitXCommand(conf, getAuthToken());
- jobId = submit.call();
- }
- else {
- SubmitCommand submit = new SubmitCommand(conf, getAuthToken());
- jobId = submit.call();
- }
- if (startJob) {
- start(jobId);
- }
- return jobId;
+ String jobId;
+ SubmitXCommand submit = new SubmitXCommand(conf, getAuthToken());
+ jobId = submit.call();
+ if (startJob) {
+ start(jobId);
+ }
+ return jobId;
}
catch (CommandException ex) {
throw new DagEngineException(ex);
@@ -156,28 +132,15 @@ public class DagEngine extends BaseEngin
try {
String jobId;
- if (useXCommand) {
- SubmitHttpXCommand submit = null;
- if (jobType.equals("pig")) {
- submit = new SubmitPigXCommand(conf, getAuthToken());
- }
- else if (jobType.equals("mapreduce")) {
- submit = new SubmitMRXCommand(conf, getAuthToken());
- }
-
- jobId = submit.call();
+ SubmitHttpXCommand submit = null;
+ if (jobType.equals("pig")) {
+ submit = new SubmitPigXCommand(conf, getAuthToken());
}
- else {
- SubmitHttpCommand submit = null;
- if (jobType.equals("pig")) {
- submit = new SubmitPigCommand(conf, getAuthToken());
- }
- else if (jobType.equals("mapreduce")) {
- submit = new SubmitMRCommand(conf, getAuthToken());
- }
-
- jobId = submit.call();
+ else if (jobType.equals("mapreduce")) {
+ submit = new SubmitMRXCommand(conf, getAuthToken());
}
+
+ jobId = submit.call();
start(jobId);
return jobId;
}
@@ -204,12 +167,7 @@ public class DagEngine extends BaseEngin
// loss of command if the queue is full or the queue is lost in case of
// failure.
try {
- if (useXCommand) {
new StartXCommand(jobId).call();
- }
- else {
- new StartCommand(jobId).call();
- }
}
catch (CommandException e) {
throw new DagEngineException(e);
@@ -228,12 +186,7 @@ public class DagEngine extends BaseEngin
// loss of command if the queue is full or the queue is lost in case of
// failure.
try {
- if (useXCommand) {
new ResumeXCommand(jobId).call();
- }
- else {
- new ResumeCommand(jobId).call();
- }
}
catch (CommandException e) {
throw new DagEngineException(e);
@@ -252,12 +205,7 @@ public class DagEngine extends BaseEngin
// loss of command if the queue is full or the queue is lost in case of
// failure.
try {
- if (useXCommand) {
- new SuspendXCommand(jobId).call();
- }
- else {
- new SuspendCommand(jobId).call();
- }
+ new SuspendXCommand(jobId).call();
}
catch (CommandException e) {
throw new DagEngineException(e);
@@ -276,13 +224,8 @@ public class DagEngine extends BaseEngin
// loss of command if the queue is full or the queue is lost in case of
// failure.
try {
- if (useXCommand) {
- new KillXCommand(jobId).call();
- }
- else {
- new KillCommand(jobId).call();
- }
- LOG.info("User " + user + " killed the WF job " + jobId);
+ new KillXCommand(jobId).call();
+ LOG.info("User " + user + " killed the WF job " + jobId);
}
catch (CommandException e) {
throw new DagEngineException(e);
@@ -309,13 +252,7 @@ public class DagEngine extends BaseEngin
public void reRun(String jobId, Configuration conf) throws DagEngineException {
try {
validateReRunConfiguration(conf);
-
- if (useXCommand) {
- new ReRunXCommand(jobId, conf, getAuthToken()).call();
- }
- else {
- new ReRunCommand(jobId, conf, getAuthToken()).call();
- }
+ new ReRunXCommand(jobId, conf, getAuthToken()).call();
start(jobId);
}
catch (CommandException ex) {
@@ -351,12 +288,8 @@ public class DagEngine extends BaseEngin
XLog.Info.get().clearParameter(XLogService.USER);
XCallable<Void> command = null;
- if (useXCommand) {
- command = new CompletedActionXCommand(actionId, externalStatus, actionData, HIGH_PRIORITY);
- }
- else {
- command = new CompletedActionCommand(actionId, externalStatus, actionData, HIGH_PRIORITY);
- }
+ command = new CompletedActionXCommand(actionId, externalStatus,
+ actionData, HIGH_PRIORITY);
if (!Services.get().get(CallableQueueService.class).queue(command)) {
LOG.warn(XLog.OPS, "queue is full or system is in SAFEMODE, ignoring callback");
}
@@ -372,12 +305,7 @@ public class DagEngine extends BaseEngin
@Override
public WorkflowJob getJob(String jobId) throws DagEngineException {
try {
- if (useXCommand) {
return new JobXCommand(jobId).call();
- }
- else {
- return new JobCommand(jobId).call();
- }
}
catch (CommandException ex) {
throw new DagEngineException(ex);
@@ -396,12 +324,7 @@ public class DagEngine extends BaseEngin
@Override
public WorkflowJob getJob(String jobId, int start, int length) throws DagEngineException {
try {
- if (useXCommand) {
- return new JobXCommand(jobId, start, length).call();
- }
- else {
- return new JobCommand(jobId, start, length).call();
- }
+ return new JobXCommand(jobId, start, length).call();
}
catch (CommandException ex) {
throw new DagEngineException(ex);
@@ -418,12 +341,7 @@ public class DagEngine extends BaseEngin
@Override
public String getDefinition(String jobId) throws DagEngineException {
try {
- if (useXCommand) {
- return new DefinitionXCommand(jobId).call();
- }
- else {
- return new DefinitionCommand(jobId).call();
- }
+ return new DefinitionXCommand(jobId).call();
}
catch (CommandException ex) {
throw new DagEngineException(ex);
@@ -518,12 +436,7 @@ public class DagEngine extends BaseEngin
public WorkflowsInfo getJobs(String filter, int start, int len) throws DagEngineException {
Map<String, List<String>> filterList = parseFilter(filter);
try {
- if (useXCommand) {
- return new JobsXCommand(filterList, start, len).call();
- }
- else {
- return new JobsCommand(filterList, start, len).call();
- }
+ return new JobsXCommand(filterList, start, len).call();
}
catch (CommandException dce) {
throw new DagEngineException(dce);
@@ -540,12 +453,7 @@ public class DagEngine extends BaseEngin
@Override
public String getJobIdForExternalId(String externalId) throws DagEngineException {
try {
- if (useXCommand) {
- return new ExternalIdXCommand(externalId).call();
- }
- else {
- return new ExternalIdCommand(externalId).call();
- }
+ return new ExternalIdXCommand(externalId).call();
}
catch (CommandException dce) {
throw new DagEngineException(dce);
@@ -564,12 +472,7 @@ public class DagEngine extends BaseEngin
public WorkflowActionBean getWorkflowAction(String actionId) throws BaseEngineException {
try {
- if (useXCommand) {
- return new WorkflowActionInfoXCommand(actionId).call();
- }
- else {
- return new WorkflowActionInfoCommand(actionId).call();
- }
+ return new WorkflowActionInfoXCommand(actionId).call();
}
catch (CommandException ex) {
throw new BaseEngineException(ex);
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java Wed Mar 7 16:02:55 2012
@@ -238,8 +238,8 @@ public class CoordActionMaterializeComma
writeActionRegistration(actionXml, actionBean, store);
// TODO: time 100s should be configurable
- queueCallable(new CoordActionNotification(actionBean), 100);
- queueCallable(new CoordActionInputCheckCommand(actionBean.getId()), 100);
+ queueCallable(new CoordActionNotificationXCommand(actionBean), 100);
+ queueCallable(new CoordActionInputCheckXCommand(actionBean.getId(), actionBean.getJobId()), 100);
}
/**
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordCommandUtils.java Wed Mar 7 16:02:55 2012
@@ -437,7 +437,7 @@ public class CoordCommandUtils {
}
else {
String action = XmlUtils.prettyPrint(eAction).toString();
- CoordActionInputCheckCommand coordActionInput = new CoordActionInputCheckCommand(actionBean.getId());
+ CoordActionInputCheckXCommand coordActionInput = new CoordActionInputCheckXCommand(actionBean.getId(), actionBean.getJobId());
StringBuilder actionXml = new StringBuilder(action);
StringBuilder existList = new StringBuilder();
StringBuilder nonExistList = new StringBuilder();
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/JobsXCommand.java Wed Mar 7 16:02:55 2012
@@ -64,7 +64,7 @@ public class JobsXCommand extends Workfl
throw new CommandException(ErrorCode.E0610);
}
for (WorkflowJobBean workflow : this.workflows.getWorkflows()) {
- workflow.setConsoleUrl(JobCommand.getJobConsoleUrl(workflow.getId()));
+ workflow.setConsoleUrl(JobXCommand.getJobConsoleUrl(workflow.getId()));
}
return this.workflows;
}
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java Wed Mar 7 16:02:55 2012
@@ -126,9 +126,9 @@ public class ReRunXCommand extends Workf
// app path could be a directory
Path path = new Path(uri.getPath());
if (!fs.isFile(path)) {
- configDefault = new Path(path, SubmitCommand.CONFIG_DEFAULT);
+ configDefault = new Path(path, SubmitXCommand.CONFIG_DEFAULT);
} else {
- configDefault = new Path(path.getParent(), SubmitCommand.CONFIG_DEFAULT);
+ configDefault = new Path(path.getParent(), SubmitXCommand.CONFIG_DEFAULT);
}
if (fs.exists(configDefault)) {
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java Wed Mar 7 16:02:55 2012
@@ -154,7 +154,7 @@ public class SignalXCommand extends Work
}
else {
String skipVar = workflowInstance.getVar(wfAction.getName() + WorkflowInstance.NODE_VAR_SEPARATOR
- + ReRunCommand.TO_SKIP);
+ + ReRunXCommand.TO_SKIP);
if (skipVar != null) {
skipAction = skipVar.equals("true");
}
@@ -264,7 +264,7 @@ public class SignalXCommand extends Work
else {
for (WorkflowActionBean newAction : WorkflowStoreService.getStartedActions(workflowInstance)) {
String skipVar = workflowInstance.getVar(newAction.getName() + WorkflowInstance.NODE_VAR_SEPARATOR
- + ReRunCommand.TO_SKIP);
+ + ReRunXCommand.TO_SKIP);
boolean skipNewAction = false;
if (skipVar != null) {
skipNewAction = skipVar.equals("true");
@@ -346,8 +346,8 @@ public class SignalXCommand extends Work
private String resolveSla(Element eSla, Configuration conf) throws CommandException {
String slaXml = null;
try {
- ELEvaluator evalSla = SubmitCommand.createELEvaluatorForGroup(conf, "wf-sla-submit");
- slaXml = SubmitCommand.resolveSla(eSla, evalSla);
+ ELEvaluator evalSla = SubmitXCommand.createELEvaluatorForGroup(conf, "wf-sla-submit");
+ slaXml = SubmitXCommand.resolveSla(eSla, evalSla);
}
catch (Exception e) {
throw new CommandException(ErrorCode.E1004, e.getMessage(), e);
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java Wed Mar 7 16:02:55 2012
@@ -110,9 +110,9 @@ public class SubmitXCommand extends Work
// app path could be a directory
Path path = new Path(uri.getPath());
if (!fs.isFile(path)) {
- configDefault = new Path(path, SubmitCommand.CONFIG_DEFAULT);
+ configDefault = new Path(path, CONFIG_DEFAULT);
} else {
- configDefault = new Path(path.getParent(), SubmitCommand.CONFIG_DEFAULT);
+ configDefault = new Path(path.getParent(), CONFIG_DEFAULT);
}
if (fs.exists(configDefault)) {
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/ActionCheckerService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/ActionCheckerService.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/ActionCheckerService.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/ActionCheckerService.java Wed Mar 7 16:02:55 2012
@@ -25,9 +25,7 @@ import org.apache.oozie.CoordinatorActio
import org.apache.oozie.ErrorCode;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.command.CommandException;
-import org.apache.oozie.command.coord.CoordActionCheckCommand;
import org.apache.oozie.command.coord.CoordActionCheckXCommand;
-import org.apache.oozie.command.wf.ActionCheckCommand;
import org.apache.oozie.command.wf.ActionCheckXCommand;
import org.apache.oozie.executor.jpa.CoordActionsRunningGetJPAExecutor;
import org.apache.oozie.executor.jpa.JPAExecutorException;
@@ -62,7 +60,6 @@ public class ActionCheckerService implem
protected static final String INSTR_CHECK_ACTIONS_COUNTER = "checks_wf_actions";
protected static final String INSTR_CHECK_COORD_ACTIONS_COUNTER = "checks_coord_actions";
- private static boolean useXCommand = true;
/**
* {@link ActionCheckRunnable} is the runnable which is scheduled to run and
@@ -129,12 +126,7 @@ public class ActionCheckerService implem
for (WorkflowActionBean action : actions) {
Services.get().get(InstrumentationService.class).get().incr(INSTRUMENTATION_GROUP,
INSTR_CHECK_ACTIONS_COUNTER, 1);
- if (useXCommand) {
queueCallable(new ActionCheckXCommand(action.getId()));
- }
- else {
- queueCallable(new ActionCheckCommand(action.getId()));
- }
}
}
@@ -168,12 +160,7 @@ public class ActionCheckerService implem
for (CoordinatorActionBean caction : cactions) {
Services.get().get(InstrumentationService.class).get().incr(INSTRUMENTATION_GROUP,
INSTR_CHECK_COORD_ACTIONS_COUNTER, 1);
- if (useXCommand) {
queueCallable(new CoordActionCheckXCommand(caction.getId(), actionCheckDelay));
- }
- else {
- queueCallable(new CoordActionCheckCommand(caction.getId(), actionCheckDelay));
- }
}
}
@@ -214,11 +201,6 @@ public class ActionCheckerService implem
Runnable actionCheckRunnable = new ActionCheckRunnable(conf.getInt(CONF_ACTION_CHECK_DELAY, 600));
services.get(SchedulerService.class).schedule(actionCheckRunnable, 10,
conf.getInt(CONF_ACTION_CHECK_INTERVAL, 60), SchedulerService.Unit.SEC);
-
- if (Services.get().getConf().getBoolean(USE_XCOMMAND, true) == false) {
- useXCommand = false;
- }
-
}
/**
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/PurgeService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/PurgeService.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/PurgeService.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/PurgeService.java Wed Mar 7 16:02:55 2012
@@ -19,9 +19,7 @@ package org.apache.oozie.service;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.command.bundle.BundlePurgeXCommand;
-import org.apache.oozie.command.coord.CoordPurgeCommand;
import org.apache.oozie.command.coord.CoordPurgeXCommand;
-import org.apache.oozie.command.wf.PurgeCommand;
import org.apache.oozie.command.wf.PurgeXCommand;
import org.apache.oozie.service.CallableQueueService;
import org.apache.oozie.service.SchedulerService;
@@ -46,8 +44,6 @@ public class PurgeService implements Ser
public static final String CONF_PURGE_INTERVAL = CONF_PREFIX + "purge.interval";
public static final String PURGE_LIMIT = CONF_PREFIX + "purge.limit";
- private static boolean useXCommand = true;
-
/**
* PurgeRunnable is the runnable which is scheduled to run at the configured interval. PurgeCommand is queued to
* remove completed jobs and associated actions older than the configured age for workflow, coordinator and bundle.
@@ -66,14 +62,9 @@ public class PurgeService implements Ser
}
public void run() {
- if (useXCommand) {
Services.get().get(CallableQueueService.class).queue(new PurgeXCommand(olderThan, limit));
Services.get().get(CallableQueueService.class).queue(new CoordPurgeXCommand(coordOlderThan, limit));
Services.get().get(CallableQueueService.class).queue(new BundlePurgeXCommand(bundleOlderThan, limit));
- } else {
- Services.get().get(CallableQueueService.class).queue(new PurgeCommand(olderThan, limit));
- Services.get().get(CallableQueueService.class).queue(new CoordPurgeCommand(coordOlderThan, limit));
- }
}
}
@@ -91,10 +82,6 @@ public class PurgeService implements Ser
conf.getInt(PURGE_LIMIT, 100));
services.get(SchedulerService.class).schedule(purgeJobsRunnable, 10, conf.getInt(CONF_PURGE_INTERVAL, 3600),
SchedulerService.Unit.SEC);
-
- if (Services.get().getConf().getBoolean(USE_XCOMMAND, true) == false) {
- useXCommand = false;
- }
}
/**
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java Wed Mar 7 16:02:55 2012
@@ -33,23 +33,17 @@ import org.apache.oozie.WorkflowActionBe
import org.apache.oozie.client.Job;
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.command.CommandException;
-import org.apache.oozie.command.coord.CoordActionInputCheckCommand;
import org.apache.oozie.command.coord.CoordActionInputCheckXCommand;
-import org.apache.oozie.command.coord.CoordActionReadyCommand;
import org.apache.oozie.command.coord.CoordActionReadyXCommand;
-import org.apache.oozie.command.coord.CoordActionStartCommand;
import org.apache.oozie.command.coord.CoordActionStartXCommand;
import org.apache.oozie.command.coord.CoordKillXCommand;
import org.apache.oozie.command.coord.CoordResumeXCommand;
import org.apache.oozie.command.coord.CoordSubmitXCommand;
import org.apache.oozie.command.coord.CoordSuspendXCommand;
-import org.apache.oozie.command.wf.ActionEndCommand;
import org.apache.oozie.command.wf.ActionEndXCommand;
-import org.apache.oozie.command.wf.ActionStartCommand;
import org.apache.oozie.command.wf.ActionStartXCommand;
import org.apache.oozie.command.wf.KillXCommand;
import org.apache.oozie.command.wf.ResumeXCommand;
-import org.apache.oozie.command.wf.SignalCommand;
import org.apache.oozie.command.wf.SignalXCommand;
import org.apache.oozie.command.wf.SuspendXCommand;
import org.apache.oozie.executor.jpa.BundleActionsGetWaitingOlderJPAExecutor;
@@ -105,8 +99,6 @@ public class RecoveryService implements
private static final String INSTR_RECOVERED_COORD_ACTIONS_COUNTER = "coord_actions";
private static final String INSTR_RECOVERED_BUNDLE_ACTIONS_COUNTER = "bundle_actions";
- private static boolean useXCommand = true;
-
/**
* RecoveryRunnable is the Runnable which is scheduled to run with the configured interval, and takes care of the
@@ -226,23 +218,17 @@ public class RecoveryService implements
Services.get().get(InstrumentationService.class).get().incr(INSTRUMENTATION_GROUP,
INSTR_RECOVERED_COORD_ACTIONS_COUNTER, 1);
if (caction.getStatus() == CoordinatorActionBean.Status.WAITING) {
- if (useXCommand) {
- queueCallable(new CoordActionInputCheckXCommand(caction.getId(), caction.getJobId()));
- } else {
- queueCallable(new CoordActionInputCheckCommand(caction.getId()));
- }
+ queueCallable(new CoordActionInputCheckXCommand(
+ caction.getId(), caction.getJobId()));
- log.info("Recover a WAITTING coord action and resubmit CoordActionInputCheckXCommand :" + caction.getId());
+ log.info("Recover a WAITTING coord action and resubmit CoordActionInputCheckXCommand :"
+ + caction.getId());
}
else if (caction.getStatus() == CoordinatorActionBean.Status.SUBMITTED) {
CoordinatorJobBean coordJob = jpaService.execute(new CoordJobGetJPAExecutor(caction.getJobId()));
-
- if (useXCommand) {
- queueCallable(new CoordActionStartXCommand(caction.getId(), coordJob.getUser(), coordJob.getAuthToken(), caction.getJobId()));
- } else {
- queueCallable(new CoordActionStartCommand(caction.getId(), coordJob.getUser(), coordJob
- .getAuthToken()));
- }
+ queueCallable(new CoordActionStartXCommand(
+ caction.getId(), coordJob.getUser(),
+ coordJob.getAuthToken(), caction.getJobId()));
log.info("Recover a SUBMITTED coord action and resubmit CoordActionStartCommand :" + caction.getId());
}
@@ -282,11 +268,7 @@ public class RecoveryService implements
List<String> jobids = jpaService.execute(new CoordActionsGetReadyGroupbyJobIDJPAExecutor(coordOlderThan));
msg.append(", COORD_READY_JOBS : " + jobids.size());
for (String jobid : jobids) {
- if (useXCommand) {
queueCallable(new CoordActionReadyXCommand(jobid));
- } else {
- queueCallable(new CoordActionReadyCommand(jobid));
- }
log.info("Recover READY coord actions for jobid :" + jobid);
}
@@ -319,56 +301,33 @@ public class RecoveryService implements
INSTR_RECOVERED_ACTIONS_COUNTER, 1);
if (action.getStatus() == WorkflowActionBean.Status.PREP
|| action.getStatus() == WorkflowActionBean.Status.START_MANUAL) {
-
- if (useXCommand) {
- queueCallable(new ActionStartXCommand(action.getId(), action.getType()));
- } else {
- queueCallable(new ActionStartCommand(action.getId(), action.getType()));
- }
-
+ queueCallable(new ActionStartXCommand(action.getId(),
+ action.getType()));
}
else if (action.getStatus() == WorkflowActionBean.Status.START_RETRY) {
Date nextRunTime = action.getPendingAge();
- if (useXCommand) {
queueCallable(new ActionStartXCommand(action.getId(), action.getType()), nextRunTime.getTime()
- System.currentTimeMillis());
- } else {
- queueCallable(new ActionStartCommand(action.getId(), action.getType()), nextRunTime.getTime()
- - System.currentTimeMillis());
- }
-
}
else if (action.getStatus() == WorkflowActionBean.Status.DONE
|| action.getStatus() == WorkflowActionBean.Status.END_MANUAL) {
- if (useXCommand) {
queueCallable(new ActionEndXCommand(action.getId(), action.getType()));
- } else {
- queueCallable(new ActionEndCommand(action.getId(), action.getType()));
- }
-
}
else if (action.getStatus() == WorkflowActionBean.Status.END_RETRY) {
Date nextRunTime = action.getPendingAge();
- if (useXCommand) {
- queueCallable(new ActionEndXCommand(action.getId(), action.getType()), nextRunTime.getTime()
- - System.currentTimeMillis());
- } else {
- queueCallable(new ActionEndCommand(action.getId(), action.getType()), nextRunTime.getTime()
- - System.currentTimeMillis());
- }
+ queueCallable(new ActionEndXCommand(action.getId(),
+ action.getType()), nextRunTime.getTime()
+ - System.currentTimeMillis());
}
else if (action.getStatus() == WorkflowActionBean.Status.OK
|| action.getStatus() == WorkflowActionBean.Status.ERROR) {
- if (useXCommand) {
- queueCallable(new SignalXCommand(action.getJobId(), action.getId()));
- } else {
- queueCallable(new SignalCommand(action.getJobId(), action.getId()));
- }
-
+ queueCallable(new SignalXCommand(action.getJobId(),
+ action.getId()));
}
else if (action.getStatus() == WorkflowActionBean.Status.USER_RETRY) {
- queueCallable(new ActionStartXCommand(action.getId(), action.getType()));
+ queueCallable(new ActionStartXCommand(action.getId(),
+ action.getType()));
}
}
}
@@ -439,10 +398,6 @@ public class RecoveryService implements
CONF_COORD_OLDER_THAN, 600),conf.getInt(CONF_BUNDLE_OLDER_THAN, 600));
services.get(SchedulerService.class).schedule(recoveryRunnable, 10, conf.getInt(CONF_SERVICE_INTERVAL, 600),
SchedulerService.Unit.SEC);
-
- if (Services.get().getConf().getBoolean(USE_XCOMMAND, true) == false) {
- useXCommand = false;
- }
}
/**
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/SLAServlet.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/SLAServlet.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/SLAServlet.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/SLAServlet.java Wed Mar 7 16:02:55 2012
@@ -27,18 +27,12 @@ import javax.servlet.http.HttpServletRes
import org.apache.oozie.ErrorCode;
import org.apache.oozie.SLAEventBean;
-import org.apache.oozie.XException;
import org.apache.oozie.client.rest.RestConstants;
import org.apache.oozie.command.CommandException;
-import org.apache.oozie.command.coord.SLAEventsCommand;
-import org.apache.oozie.service.SLAStoreService;
-import org.apache.oozie.service.Services;
-import org.apache.oozie.store.SLAStore;
-import org.apache.oozie.store.StoreException;
+import org.apache.oozie.command.coord.SLAEventsXCommand;
import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XmlUtils;
import org.jdom.Element;
-import org.jdom.JDOMException;
public class SLAServlet extends JsonRestServlet {
private static final String INSTRUMENTATION_NAME = "sla";
@@ -62,7 +56,6 @@ public class SLAServlet extends JsonRest
/**
* Return information about SLA Events.
*/
- @SuppressWarnings("unchecked")
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
@@ -81,7 +74,7 @@ public class SLAServlet extends JsonRest
if (gtSequenceNum != null) {
long seqId = Long.parseLong(gtSequenceNum);
stopCron();
- SLAEventsCommand seCommand = new SLAEventsCommand(seqId, maxNoEvents);
+ SLAEventsXCommand seCommand = new SLAEventsXCommand(seqId, maxNoEvents);
List<SLAEventBean> slaEvntList = seCommand.call();
long lastSeqId = seCommand.getLastSeqId();
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java Wed Mar 7 16:02:55 2012
@@ -27,15 +27,11 @@ import org.apache.hadoop.conf.Configurat
import org.apache.oozie.client.CoordinatorAction;
import org.apache.oozie.client.CoordinatorJob;
import org.apache.oozie.client.OozieClient;
-import org.apache.oozie.client.Job.Status;
-import org.apache.oozie.client.rest.JsonCoordinatorAction;
-import org.apache.oozie.command.coord.CoordSubmitCommand;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.StoreService;
import org.apache.oozie.store.CoordinatorStore;
import org.apache.oozie.store.StoreException;
import org.apache.oozie.test.XTestCase;
-import org.apache.oozie.test.XTestCase.Predicate;
import org.apache.oozie.util.XConfiguration;
public class TestCoordinatorEngine extends XTestCase {
@@ -409,7 +405,7 @@ public class TestCoordinatorEngine exten
private void checkCoordJob(String jobId) throws StoreException {
CoordinatorStore store = Services.get().get(StoreService.class).getStore(CoordinatorStore.class);
try {
- CoordinatorJobBean job = store.getCoordinatorJob(jobId, false);
+ store.getCoordinatorJob(jobId, false);
}
catch (StoreException se) {
se.printStackTrace();
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/TestActionFailover.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/TestActionFailover.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/TestActionFailover.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/TestActionFailover.java Wed Mar 7 16:02:55 2012
@@ -31,7 +31,7 @@ import org.apache.oozie.client.WorkflowJ
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.FaultInjection;
-import org.apache.oozie.command.wf.ActionStartCommand;
+import org.apache.oozie.command.wf.ActionStartXCommand;
import org.apache.oozie.command.SkipCommitFaultInjection;
import org.apache.oozie.service.WorkflowStoreService;
import org.apache.oozie.store.WorkflowStore;
@@ -44,7 +44,7 @@ public class TestActionFailover extends
@Override
protected void setUp() throws Exception {
- Class c = ActionStartCommand.class;
+ Class c = ActionStartXCommand.class;
super.setUp();
LocalOozie.start();
}
@@ -104,7 +104,7 @@ public class TestActionFailover extends
setSystemProperty(FaultInjection.FAULT_INJECTION, "false");
setSystemProperty(SkipCommitFaultInjection.ACTION_FAILOVER_FAULT_INJECTION, "false");
- ActionStartCommand actionStartCommand = new ActionStartCommand(action.getId(), action.getType());
+ ActionStartXCommand actionStartCommand = new ActionStartXCommand(action.getId(), action.getType());
actionStartCommand.call();
store = Services.get().get(WorkflowStoreService.class).create();
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java Wed Mar 7 16:02:55 2012
@@ -20,7 +20,7 @@ package org.apache.oozie.action.hadoop;
import org.apache.oozie.DagELFunctions;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
-import org.apache.oozie.command.wf.ActionCommand;
+import org.apache.oozie.command.wf.ActionXCommand;
import org.apache.oozie.service.ELService;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.UUIDService;
@@ -58,7 +58,7 @@ public class TestHadoopELFunctions exten
final WorkflowActionBean action = new WorkflowActionBean();
action.setName("H");
- ActionCommand.ActionExecutorContext context = new ActionCommand.ActionExecutorContext(workflow, action, false);
+ ActionXCommand.ActionExecutorContext context = new ActionXCommand.ActionExecutorContext(workflow, action, false, false);
context.setVar(MapReduceActionExecutor.HADOOP_COUNTERS, counters);
ELEvaluator eval = Services.get().get(ELService.class).createEvaluator("workflow");
@@ -102,7 +102,7 @@ public class TestHadoopELFunctions exten
final WorkflowActionBean action = new WorkflowActionBean();
action.setName("H");
- ActionCommand.ActionExecutorContext context = new ActionCommand.ActionExecutorContext(workflow, action, false);
+ ActionXCommand.ActionExecutorContext context = new ActionXCommand.ActionExecutorContext(workflow, action, false, false);
context.setVar(MapReduceActionExecutor.HADOOP_COUNTERS, pigStats);
ELEvaluator eval = Services.get().get(ELService.class).createEvaluator("workflow");
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java Wed Mar 7 16:02:55 2012
@@ -409,7 +409,6 @@ public class TestCoordSubmitXCommand ext
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
- String jobId = null;
try {
sc.call();
fail("Exception expected if schema has errors!");
@@ -465,7 +464,6 @@ public class TestCoordSubmitXCommand ext
// conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.GROUP_NAME, "other");
CoordSubmitXCommand sc = new CoordSubmitXCommand(conf, "UNIT_TESTING");
- String jobId = null;
try {
sc.call();
fail("Exception expected if user.name is not set!");
@@ -669,7 +667,7 @@ public class TestCoordSubmitXCommand ext
if (withDefaults) {
String defaults = "<configuration><property><name>startTime</name>" +
"<value>2009-02-01T01:00Z</value></property></configuration>";
- writeToFile(defaults, getTestCaseDir() + File.separator + CoordSubmitCommand.CONFIG_DEFAULT);
+ writeToFile(defaults, getTestCaseDir() + File.separator + CoordSubmitXCommand.CONFIG_DEFAULT);
String jobId = sc.call();
assertEquals(jobId.substring(jobId.length() - 2), "-C");
}
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionErrors.java Wed Mar 7 16:02:55 2012
@@ -226,7 +226,7 @@ public class TestActionErrors extends XD
* @throws Exception
*/
public void testExecutionDataNotSet() throws Exception {
- _testDataNotSet("avoid-set-execution-data", ActionStartCommand.START_DATA_MISSING);
+ _testDataNotSet("avoid-set-execution-data", ActionStartXCommand.START_DATA_MISSING);
}
/**
@@ -236,7 +236,7 @@ public class TestActionErrors extends XD
* @throws Exception
*/
public void testEndDataNotSet() throws Exception {
- _testDataNotSet("avoid-set-end-data", ActionEndCommand.END_DATA_MISSING);
+ _testDataNotSet("avoid-set-end-data", ActionEndXCommand.END_DATA_MISSING);
}
/**
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestPurgeService.java Wed Mar 7 16:02:55 2012
@@ -40,7 +40,7 @@ import org.apache.oozie.DagEngineExcepti
import org.apache.oozie.ForTestingActionExecutor;
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.command.wf.PurgeCommand;
+import org.apache.oozie.command.wf.PurgeXCommand;
import org.apache.oozie.executor.jpa.BundleActionGetJPAExecutor;
import org.apache.oozie.executor.jpa.BundleJobGetJPAExecutor;
import org.apache.oozie.executor.jpa.BundleJobInsertJPAExecutor;
@@ -111,7 +111,7 @@ public class TestPurgeService extends XD
}
});
assertEquals(WorkflowJob.Status.SUCCEEDED, engine.getJob(jobId).getStatus());
- new PurgeCommand(1, 10000).call();
+ new PurgeXCommand(1, 10000).call();
Thread.sleep(1000);
JPAService jpaService = Services.get().get(JPAService.class);
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1298003&r1=1298002&r2=1298003&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Wed Mar 7 16:02:55 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-723 Getting rid of the unused Commands classes (mohamed via tucu)
OOZIE-719 Missing java docs for several methods on ActionXCommand.java (Mohamed via Mohammad)
OOZIE-738 HadoopAccessorService configs typo/missed value (tucu)
OOZIE-737 ooziedb tool does not register SLAEventBean resulting in an incorrect DB creation (tucu)