Changed names of classes to Work
git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_dev_next@657 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/ClusterControllerService.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/ClusterControllerService.java
index 2161dde..7925f0d 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/ClusterControllerService.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/ClusterControllerService.java
@@ -43,21 +43,21 @@
import edu.uci.ics.hyracks.control.cc.job.IJobStatusConditionVariable;
import edu.uci.ics.hyracks.control.cc.job.JobRun;
import edu.uci.ics.hyracks.control.cc.web.WebServer;
-import edu.uci.ics.hyracks.control.cc.work.ApplicationDestroyEvent;
-import edu.uci.ics.hyracks.control.cc.work.ApplicationStartEvent;
-import edu.uci.ics.hyracks.control.cc.work.GetJobStatusConditionVariableEvent;
-import edu.uci.ics.hyracks.control.cc.work.GetJobStatusEvent;
-import edu.uci.ics.hyracks.control.cc.work.JobCreateEvent;
-import edu.uci.ics.hyracks.control.cc.work.JobStartEvent;
-import edu.uci.ics.hyracks.control.cc.work.NodeHeartbeatEvent;
-import edu.uci.ics.hyracks.control.cc.work.RegisterNodeEvent;
-import edu.uci.ics.hyracks.control.cc.work.RegisterPartitionAvailibilityEvent;
-import edu.uci.ics.hyracks.control.cc.work.RegisterPartitionRequestEvent;
-import edu.uci.ics.hyracks.control.cc.work.RemoveDeadNodesEvent;
-import edu.uci.ics.hyracks.control.cc.work.ReportProfilesEvent;
-import edu.uci.ics.hyracks.control.cc.work.TaskCompleteEvent;
-import edu.uci.ics.hyracks.control.cc.work.TaskFailureEvent;
-import edu.uci.ics.hyracks.control.cc.work.UnregisterNodeEvent;
+import edu.uci.ics.hyracks.control.cc.work.ApplicationDestroyWork;
+import edu.uci.ics.hyracks.control.cc.work.ApplicationStartWork;
+import edu.uci.ics.hyracks.control.cc.work.GetJobStatusConditionVariableWork;
+import edu.uci.ics.hyracks.control.cc.work.GetJobStatusWork;
+import edu.uci.ics.hyracks.control.cc.work.JobCreateWork;
+import edu.uci.ics.hyracks.control.cc.work.JobStartWork;
+import edu.uci.ics.hyracks.control.cc.work.NodeHeartbeatWork;
+import edu.uci.ics.hyracks.control.cc.work.RegisterNodeWork;
+import edu.uci.ics.hyracks.control.cc.work.RegisterPartitionAvailibilityWork;
+import edu.uci.ics.hyracks.control.cc.work.RegisterPartitionRequestWork;
+import edu.uci.ics.hyracks.control.cc.work.RemoveDeadNodesWork;
+import edu.uci.ics.hyracks.control.cc.work.ReportProfilesWork;
+import edu.uci.ics.hyracks.control.cc.work.TaskCompleteWork;
+import edu.uci.ics.hyracks.control.cc.work.TaskFailureWork;
+import edu.uci.ics.hyracks.control.cc.work.UnregisterNodeWork;
import edu.uci.ics.hyracks.control.common.AbstractRemoteService;
import edu.uci.ics.hyracks.control.common.base.IClusterController;
import edu.uci.ics.hyracks.control.common.base.INodeController;
@@ -185,7 +185,7 @@
@Override
public JobId createJob(String appName, byte[] jobSpec, EnumSet<JobFlag> jobFlags) throws Exception {
JobId jobId = createJobId();
- JobCreateEvent jce = new JobCreateEvent(this, jobId, appName, jobSpec, jobFlags);
+ JobCreateWork jce = new JobCreateWork(this, jobId, appName, jobSpec, jobFlags);
jobQueue.schedule(jce);
jce.sync();
return jobId;
@@ -196,7 +196,7 @@
INodeController nodeController = reg.getNodeController();
String id = reg.getNodeId();
NodeControllerState state = new NodeControllerState(nodeController, reg);
- jobQueue.scheduleAndSync(new RegisterNodeEvent(this, id, state));
+ jobQueue.scheduleAndSync(new RegisterNodeWork(this, id, state));
nodeController.notifyRegistration(this);
LOGGER.log(Level.INFO, "Registered INodeController: id = " + id);
NodeParameters params = new NodeParameters();
@@ -209,40 +209,40 @@
@Override
public void unregisterNode(INodeController nodeController) throws Exception {
String id = nodeController.getId();
- jobQueue.scheduleAndSync(new UnregisterNodeEvent(this, id));
+ jobQueue.scheduleAndSync(new UnregisterNodeWork(this, id));
LOGGER.log(Level.INFO, "Unregistered INodeController");
}
@Override
public void notifyTaskComplete(JobId jobId, TaskAttemptId taskId, String nodeId, TaskProfile statistics)
throws Exception {
- TaskCompleteEvent sce = new TaskCompleteEvent(this, jobId, taskId, nodeId);
+ TaskCompleteWork sce = new TaskCompleteWork(this, jobId, taskId, nodeId);
jobQueue.schedule(sce);
}
@Override
public void notifyTaskFailure(JobId jobId, TaskAttemptId taskId, String nodeId, Exception exception)
throws Exception {
- TaskFailureEvent tfe = new TaskFailureEvent(this, jobId, taskId, nodeId, exception);
+ TaskFailureWork tfe = new TaskFailureWork(this, jobId, taskId, nodeId, exception);
jobQueue.schedule(tfe);
}
@Override
public JobStatus getJobStatus(JobId jobId) throws Exception {
- GetJobStatusEvent gse = new GetJobStatusEvent(this, jobId);
+ GetJobStatusWork gse = new GetJobStatusWork(this, jobId);
jobQueue.scheduleAndSync(gse);
return gse.getStatus();
}
@Override
public void start(JobId jobId) throws Exception {
- JobStartEvent jse = new JobStartEvent(this, jobId);
+ JobStartWork jse = new JobStartWork(this, jobId);
jobQueue.schedule(jse);
}
@Override
public void waitForCompletion(JobId jobId) throws Exception {
- GetJobStatusConditionVariableEvent e = new GetJobStatusConditionVariableEvent(this, jobId);
+ GetJobStatusConditionVariableWork e = new GetJobStatusConditionVariableWork(this, jobId);
jobQueue.scheduleAndSync(e);
IJobStatusConditionVariable var = e.getConditionVariable();
if (var != null) {
@@ -252,12 +252,12 @@
@Override
public void reportProfile(String id, List<JobProfile> profiles) throws Exception {
- jobQueue.schedule(new ReportProfilesEvent(this, profiles));
+ jobQueue.schedule(new ReportProfilesWork(this, profiles));
}
@Override
public synchronized void nodeHeartbeat(String id, HeartbeatData hbData) throws Exception {
- jobQueue.schedule(new NodeHeartbeatEvent(this, id, hbData));
+ jobQueue.schedule(new NodeHeartbeatWork(this, id, hbData));
}
@Override
@@ -274,14 +274,14 @@
@Override
public void destroyApplication(String appName) throws Exception {
FutureValue fv = new FutureValue();
- jobQueue.schedule(new ApplicationDestroyEvent(this, appName, fv));
+ jobQueue.schedule(new ApplicationDestroyWork(this, appName, fv));
fv.get();
}
@Override
public void startApplication(final String appName) throws Exception {
FutureValue fv = new FutureValue();
- jobQueue.schedule(new ApplicationStartEvent(this, appName, fv));
+ jobQueue.schedule(new ApplicationStartWork(this, appName, fv));
fv.get();
}
@@ -292,18 +292,18 @@
@Override
public void registerPartitionProvider(PartitionDescriptor partitionDescriptor) {
- jobQueue.schedule(new RegisterPartitionAvailibilityEvent(this, partitionDescriptor));
+ jobQueue.schedule(new RegisterPartitionAvailibilityWork(this, partitionDescriptor));
}
@Override
public void registerPartitionRequest(PartitionRequest partitionRequest) {
- jobQueue.schedule(new RegisterPartitionRequestEvent(this, partitionRequest));
+ jobQueue.schedule(new RegisterPartitionRequestWork(this, partitionRequest));
}
private class DeadNodeSweeper extends TimerTask {
@Override
public void run() {
- jobQueue.schedule(new RemoveDeadNodesEvent(ClusterControllerService.this));
+ jobQueue.schedule(new RemoveDeadNodesWork(ClusterControllerService.this));
}
}
}
\ No newline at end of file
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/scheduler/JobScheduler.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/scheduler/JobScheduler.java
index 7683b67..14489a6 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/scheduler/JobScheduler.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/scheduler/JobScheduler.java
@@ -58,7 +58,7 @@
import edu.uci.ics.hyracks.control.cc.job.TaskCluster;
import edu.uci.ics.hyracks.control.cc.job.TaskClusterAttempt;
import edu.uci.ics.hyracks.control.cc.partitions.PartitionMatchMaker;
-import edu.uci.ics.hyracks.control.cc.work.JobCleanupEvent;
+import edu.uci.ics.hyracks.control.cc.work.JobCleanupWork;
import edu.uci.ics.hyracks.control.common.job.PartitionState;
import edu.uci.ics.hyracks.control.common.job.TaskAttemptDescriptor;
@@ -189,7 +189,7 @@
+ inProgressTaskClusters);
}
if (taskClusterRoots.isEmpty() && inProgressTaskClusters.isEmpty()) {
- ccs.getJobQueue().schedule(new JobCleanupEvent(ccs, jobRun.getJobId(), JobStatus.TERMINATED, null));
+ ccs.getJobQueue().schedule(new JobCleanupWork(ccs, jobRun.getJobId(), JobStatus.TERMINATED, null));
return;
}
startRunnableTaskClusters(taskClusterRoots);
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/JobsRESTAPIFunction.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/JobsRESTAPIFunction.java
index 5cd566a..8141dbc 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/JobsRESTAPIFunction.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/JobsRESTAPIFunction.java
@@ -19,10 +19,10 @@
import edu.uci.ics.hyracks.api.job.JobId;
import edu.uci.ics.hyracks.control.cc.ClusterControllerService;
import edu.uci.ics.hyracks.control.cc.web.util.IJSONOutputFunction;
-import edu.uci.ics.hyracks.control.cc.work.GetJobActivityGraphJSONEvent;
-import edu.uci.ics.hyracks.control.cc.work.GetJobRunJSONEvent;
-import edu.uci.ics.hyracks.control.cc.work.GetJobSpecificationJSONEvent;
-import edu.uci.ics.hyracks.control.cc.work.GetJobSummariesJSONEvent;
+import edu.uci.ics.hyracks.control.cc.work.GetJobActivityGraphJSONWork;
+import edu.uci.ics.hyracks.control.cc.work.GetJobRunJSONWork;
+import edu.uci.ics.hyracks.control.cc.work.GetJobSpecificationJSONWork;
+import edu.uci.ics.hyracks.control.cc.work.GetJobSummariesJSONWork;
public class JobsRESTAPIFunction implements IJSONOutputFunction {
private ClusterControllerService ccs;
@@ -40,7 +40,7 @@
break;
}
case 0: {
- GetJobSummariesJSONEvent gjse = new GetJobSummariesJSONEvent(ccs);
+ GetJobSummariesJSONWork gjse = new GetJobSummariesJSONWork(ccs);
ccs.getJobQueue().scheduleAndSync(gjse);
result.put("result", gjse.getSummaries());
break;
@@ -50,15 +50,15 @@
JobId jobId = JobId.parse(arguments[0]);
if ("job-specification".equalsIgnoreCase(arguments[1])) {
- GetJobSpecificationJSONEvent gjse = new GetJobSpecificationJSONEvent(ccs, jobId);
+ GetJobSpecificationJSONWork gjse = new GetJobSpecificationJSONWork(ccs, jobId);
ccs.getJobQueue().scheduleAndSync(gjse);
result.put("result", gjse.getJSON());
} else if ("job-activity-graph".equalsIgnoreCase(arguments[1])) {
- GetJobActivityGraphJSONEvent gjage = new GetJobActivityGraphJSONEvent(ccs, jobId);
+ GetJobActivityGraphJSONWork gjage = new GetJobActivityGraphJSONWork(ccs, jobId);
ccs.getJobQueue().scheduleAndSync(gjage);
result.put("result", gjage.getJSON());
} else if ("job-run".equalsIgnoreCase(arguments[1])) {
- GetJobRunJSONEvent gjre = new GetJobRunJSONEvent(ccs, jobId);
+ GetJobRunJSONWork gjre = new GetJobRunJSONWork(ccs, jobId);
ccs.getJobQueue().scheduleAndSync(gjre);
result.put("result", gjre.getJSON());
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/NodesRESTAPIFunction.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/NodesRESTAPIFunction.java
index 8b38b9b..3e5dd7a 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/NodesRESTAPIFunction.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/NodesRESTAPIFunction.java
@@ -18,8 +18,8 @@
import edu.uci.ics.hyracks.control.cc.ClusterControllerService;
import edu.uci.ics.hyracks.control.cc.web.util.IJSONOutputFunction;
-import edu.uci.ics.hyracks.control.cc.work.GetNodeDetailsJSONEvent;
-import edu.uci.ics.hyracks.control.cc.work.GetNodeSummariesJSONEvent;
+import edu.uci.ics.hyracks.control.cc.work.GetNodeDetailsJSONWork;
+import edu.uci.ics.hyracks.control.cc.work.GetNodeSummariesJSONWork;
public class NodesRESTAPIFunction implements IJSONOutputFunction {
private ClusterControllerService ccs;
@@ -34,12 +34,12 @@
switch (arguments.length) {
case 1: {
if ("".equals(arguments[0])) {
- GetNodeSummariesJSONEvent gnse = new GetNodeSummariesJSONEvent(ccs);
+ GetNodeSummariesJSONWork gnse = new GetNodeSummariesJSONWork(ccs);
ccs.getJobQueue().scheduleAndSync(gnse);
result.put("result", gnse.getSummaries());
} else {
String nodeId = arguments[0];
- GetNodeDetailsJSONEvent gnde = new GetNodeDetailsJSONEvent(ccs, nodeId);
+ GetNodeDetailsJSONWork gnde = new GetNodeDetailsJSONWork(ccs, nodeId);
ccs.getJobQueue().scheduleAndSync(gnde);
result.put("result", gnde.getDetail());
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/AbstractTaskLifecycleEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/AbstractTaskLifecycleWork.java
similarity index 93%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/AbstractTaskLifecycleEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/AbstractTaskLifecycleWork.java
index 02f9b75..b240da4 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/AbstractTaskLifecycleEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/AbstractTaskLifecycleWork.java
@@ -31,13 +31,13 @@
import edu.uci.ics.hyracks.control.cc.job.TaskClusterAttempt;
import edu.uci.ics.hyracks.control.common.work.AbstractWork;
-public abstract class AbstractTaskLifecycleEvent extends AbstractWork {
+public abstract class AbstractTaskLifecycleWork extends AbstractWork {
protected final ClusterControllerService ccs;
protected final JobId jobId;
protected final TaskAttemptId taId;
protected final String nodeId;
- public AbstractTaskLifecycleEvent(ClusterControllerService ccs, JobId jobId, TaskAttemptId taId, String nodeId) {
+ public AbstractTaskLifecycleWork(ClusterControllerService ccs, JobId jobId, TaskAttemptId taId, String nodeId) {
this.ccs = ccs;
this.jobId = jobId;
this.taId = taId;
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationDestroyEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationDestroyWork.java
similarity index 94%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationDestroyEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationDestroyWork.java
index c263466..94873d3 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationDestroyEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationDestroyWork.java
@@ -26,12 +26,12 @@
import edu.uci.ics.hyracks.control.common.work.AbstractWork;
import edu.uci.ics.hyracks.control.common.work.FutureValue;
-public class ApplicationDestroyEvent extends AbstractWork {
+public class ApplicationDestroyWork extends AbstractWork {
private final ClusterControllerService ccs;
private final String appName;
private FutureValue fv;
- public ApplicationDestroyEvent(ClusterControllerService ccs, String appName, FutureValue fv) {
+ public ApplicationDestroyWork(ClusterControllerService ccs, String appName, FutureValue fv) {
this.ccs = ccs;
this.appName = appName;
this.fv = fv;
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationStartEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationStartWork.java
similarity index 94%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationStartEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationStartWork.java
index 5d77177..a65703b 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationStartEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ApplicationStartWork.java
@@ -27,12 +27,12 @@
import edu.uci.ics.hyracks.control.common.work.AbstractWork;
import edu.uci.ics.hyracks.control.common.work.FutureValue;
-public class ApplicationStartEvent extends AbstractWork {
+public class ApplicationStartWork extends AbstractWork {
private final ClusterControllerService ccs;
private final String appName;
private final FutureValue fv;
- public ApplicationStartEvent(ClusterControllerService ccs, String appName, FutureValue fv) {
+ public ApplicationStartWork(ClusterControllerService ccs, String appName, FutureValue fv) {
this.ccs = ccs;
this.appName = appName;
this.fv = fv;
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobActivityGraphJSONEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobActivityGraphJSONWork.java
similarity index 89%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobActivityGraphJSONEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobActivityGraphJSONWork.java
index 8ca04eb..28823c2 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobActivityGraphJSONEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobActivityGraphJSONWork.java
@@ -21,12 +21,12 @@
import edu.uci.ics.hyracks.control.cc.job.JobRun;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class GetJobActivityGraphJSONEvent extends SynchronizableWork {
+public class GetJobActivityGraphJSONWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final JobId jobId;
private JSONObject json;
- public GetJobActivityGraphJSONEvent(ClusterControllerService ccs, JobId jobId) {
+ public GetJobActivityGraphJSONWork(ClusterControllerService ccs, JobId jobId) {
this.ccs = ccs;
this.jobId = jobId;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobProfileJSONEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobProfileJSONWork.java
similarity index 90%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobProfileJSONEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobProfileJSONWork.java
index 5d2659e..513cb93 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobProfileJSONEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobProfileJSONWork.java
@@ -21,12 +21,12 @@
import edu.uci.ics.hyracks.control.cc.job.JobRun;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class GetJobProfileJSONEvent extends SynchronizableWork {
+public class GetJobProfileJSONWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final JobId jobId;
private JSONObject json;
- public GetJobProfileJSONEvent(ClusterControllerService ccs, JobId jobId) {
+ public GetJobProfileJSONWork(ClusterControllerService ccs, JobId jobId) {
this.ccs = ccs;
this.jobId = jobId;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobRunJSONEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobRunJSONWork.java
similarity index 90%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobRunJSONEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobRunJSONWork.java
index 61cb078..9de7613 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobRunJSONEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobRunJSONWork.java
@@ -21,12 +21,12 @@
import edu.uci.ics.hyracks.control.cc.job.JobRun;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class GetJobRunJSONEvent extends SynchronizableWork {
+public class GetJobRunJSONWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final JobId jobId;
private JSONObject json;
- public GetJobRunJSONEvent(ClusterControllerService ccs, JobId jobId) {
+ public GetJobRunJSONWork(ClusterControllerService ccs, JobId jobId) {
this.ccs = ccs;
this.jobId = jobId;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSpecificationJSONEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSpecificationJSONWork.java
similarity index 89%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSpecificationJSONEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSpecificationJSONWork.java
index 8f1c928..7e16c9c 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSpecificationJSONEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSpecificationJSONWork.java
@@ -21,12 +21,12 @@
import edu.uci.ics.hyracks.control.cc.job.JobRun;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class GetJobSpecificationJSONEvent extends SynchronizableWork {
+public class GetJobSpecificationJSONWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final JobId jobId;
private JSONObject json;
- public GetJobSpecificationJSONEvent(ClusterControllerService ccs, JobId jobId) {
+ public GetJobSpecificationJSONWork(ClusterControllerService ccs, JobId jobId) {
this.ccs = ccs;
this.jobId = jobId;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusConditionVariableEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusConditionVariableWork.java
similarity index 88%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusConditionVariableEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusConditionVariableWork.java
index f135eb1..67eca4a 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusConditionVariableEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusConditionVariableWork.java
@@ -19,12 +19,12 @@
import edu.uci.ics.hyracks.control.cc.job.IJobStatusConditionVariable;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class GetJobStatusConditionVariableEvent extends SynchronizableWork {
+public class GetJobStatusConditionVariableWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final JobId jobId;
private IJobStatusConditionVariable cVar;
- public GetJobStatusConditionVariableEvent(ClusterControllerService ccs, JobId jobId) {
+ public GetJobStatusConditionVariableWork(ClusterControllerService ccs, JobId jobId) {
this.ccs = ccs;
this.jobId = jobId;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusWork.java
similarity index 90%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusWork.java
index 7397c9e..cd29207 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobStatusWork.java
@@ -20,12 +20,12 @@
import edu.uci.ics.hyracks.control.cc.job.JobRun;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class GetJobStatusEvent extends SynchronizableWork {
+public class GetJobStatusWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final JobId jobId;
private JobStatus status;
- public GetJobStatusEvent(ClusterControllerService ccs, JobId jobId) {
+ public GetJobStatusWork(ClusterControllerService ccs, JobId jobId) {
this.ccs = ccs;
this.jobId = jobId;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSummariesJSONEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSummariesJSONWork.java
similarity index 92%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSummariesJSONEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSummariesJSONWork.java
index e25f26e..64b9058 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSummariesJSONEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetJobSummariesJSONWork.java
@@ -21,11 +21,11 @@
import edu.uci.ics.hyracks.control.cc.job.JobRun;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class GetJobSummariesJSONEvent extends SynchronizableWork {
+public class GetJobSummariesJSONWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private JSONArray summaries;
- public GetJobSummariesJSONEvent(ClusterControllerService ccs) {
+ public GetJobSummariesJSONWork(ClusterControllerService ccs) {
this.ccs = ccs;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeDetailsJSONEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeDetailsJSONWork.java
similarity index 90%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeDetailsJSONEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeDetailsJSONWork.java
index e2e03f0..4a1f108 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeDetailsJSONEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeDetailsJSONWork.java
@@ -20,12 +20,12 @@
import edu.uci.ics.hyracks.control.cc.NodeControllerState;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class GetNodeDetailsJSONEvent extends SynchronizableWork {
+public class GetNodeDetailsJSONWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final String nodeId;
private JSONObject detail;
- public GetNodeDetailsJSONEvent(ClusterControllerService ccs, String nodeId) {
+ public GetNodeDetailsJSONWork(ClusterControllerService ccs, String nodeId) {
this.ccs = ccs;
this.nodeId = nodeId;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeSummariesJSONEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeSummariesJSONWork.java
similarity index 90%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeSummariesJSONEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeSummariesJSONWork.java
index 811a1d2..6ac4ac2 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeSummariesJSONEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/GetNodeSummariesJSONWork.java
@@ -20,11 +20,11 @@
import edu.uci.ics.hyracks.control.cc.NodeControllerState;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class GetNodeSummariesJSONEvent extends SynchronizableWork {
+public class GetNodeSummariesJSONWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private JSONArray summaries;
- public GetNodeSummariesJSONEvent(ClusterControllerService ccs) {
+ public GetNodeSummariesJSONWork(ClusterControllerService ccs) {
this.ccs = ccs;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCleanupEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCleanupWork.java
similarity index 94%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCleanupEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCleanupWork.java
index bb76d1c..0d87b0d 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCleanupEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCleanupWork.java
@@ -27,13 +27,13 @@
import edu.uci.ics.hyracks.control.cc.remote.ops.JobCompleteNotifier;
import edu.uci.ics.hyracks.control.common.work.AbstractWork;
-public class JobCleanupEvent extends AbstractWork {
+public class JobCleanupWork extends AbstractWork {
private ClusterControllerService ccs;
private JobId jobId;
private JobStatus status;
private Exception exception;
- public JobCleanupEvent(ClusterControllerService ccs, JobId jobId, JobStatus status, Exception exception) {
+ public JobCleanupWork(ClusterControllerService ccs, JobId jobId, JobStatus status, Exception exception) {
this.ccs = ccs;
this.jobId = jobId;
this.status = status;
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCreateEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCreateWork.java
similarity index 94%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCreateEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCreateWork.java
index 7b0b49a..7ede593 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCreateEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobCreateWork.java
@@ -32,14 +32,14 @@
import edu.uci.ics.hyracks.control.cc.scheduler.JobScheduler;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class JobCreateEvent extends SynchronizableWork {
+public class JobCreateWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final byte[] jobSpec;
private final EnumSet<JobFlag> jobFlags;
private final JobId jobId;
private final String appName;
- public JobCreateEvent(ClusterControllerService ccs, JobId jobId, String appName, byte[] jobSpec,
+ public JobCreateWork(ClusterControllerService ccs, JobId jobId, String appName, byte[] jobSpec,
EnumSet<JobFlag> jobFlags) {
this.jobId = jobId;
this.ccs = ccs;
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobStartEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobStartWork.java
similarity index 87%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobStartEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobStartWork.java
index da7c966..0fa5710 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobStartEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/JobStartWork.java
@@ -20,11 +20,11 @@
import edu.uci.ics.hyracks.control.cc.job.JobRun;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class JobStartEvent extends SynchronizableWork {
+public class JobStartWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final JobId jobId;
- public JobStartEvent(ClusterControllerService ccs, JobId jobId) {
+ public JobStartWork(ClusterControllerService ccs, JobId jobId) {
this.ccs = ccs;
this.jobId = jobId;
}
@@ -42,7 +42,7 @@
try {
run.getScheduler().startJob();
} catch (Exception e) {
- ccs.getJobQueue().schedule(new JobCleanupEvent(ccs, run.getJobId(), JobStatus.FAILURE, e));
+ ccs.getJobQueue().schedule(new JobCleanupWork(ccs, run.getJobId(), JobStatus.FAILURE, e));
}
}
}
\ No newline at end of file
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/NodeHeartbeatEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/NodeHeartbeatWork.java
similarity index 90%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/NodeHeartbeatEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/NodeHeartbeatWork.java
index e2bd4ed..6b139a5 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/NodeHeartbeatEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/NodeHeartbeatWork.java
@@ -22,12 +22,12 @@
import edu.uci.ics.hyracks.control.common.heartbeat.HeartbeatData;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class NodeHeartbeatEvent extends SynchronizableWork {
+public class NodeHeartbeatWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final String nodeId;
private final HeartbeatData hbData;
- public NodeHeartbeatEvent(ClusterControllerService ccs, String nodeId, HeartbeatData hbData) {
+ public NodeHeartbeatWork(ClusterControllerService ccs, String nodeId, HeartbeatData hbData) {
this.ccs = ccs;
this.nodeId = nodeId;
this.hbData = hbData;
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterNodeEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterNodeWork.java
similarity index 91%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterNodeEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterNodeWork.java
index 33788f7..392708b 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterNodeEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterNodeWork.java
@@ -22,12 +22,12 @@
import edu.uci.ics.hyracks.control.cc.NodeControllerState;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class RegisterNodeEvent extends SynchronizableWork {
+public class RegisterNodeWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final String nodeId;
private final NodeControllerState state;
- public RegisterNodeEvent(ClusterControllerService ccs, String nodeId, NodeControllerState state) {
+ public RegisterNodeWork(ClusterControllerService ccs, String nodeId, NodeControllerState state) {
this.ccs = ccs;
this.nodeId = nodeId;
this.state = state;
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionAvailibilityEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionAvailibilityWork.java
similarity index 91%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionAvailibilityEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionAvailibilityWork.java
index de8dafa..ec9a356 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionAvailibilityEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionAvailibilityWork.java
@@ -26,11 +26,11 @@
import edu.uci.ics.hyracks.control.common.job.PartitionRequest;
import edu.uci.ics.hyracks.control.common.work.AbstractWork;
-public class RegisterPartitionAvailibilityEvent extends AbstractWork {
+public class RegisterPartitionAvailibilityWork extends AbstractWork {
private final ClusterControllerService ccs;
private final PartitionDescriptor partitionDescriptor;
- public RegisterPartitionAvailibilityEvent(ClusterControllerService ccs, PartitionDescriptor partitionDescriptor) {
+ public RegisterPartitionAvailibilityWork(ClusterControllerService ccs, PartitionDescriptor partitionDescriptor) {
this.ccs = ccs;
this.partitionDescriptor = partitionDescriptor;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionRequestEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionRequestWork.java
similarity index 91%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionRequestEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionRequestWork.java
index a5cb0e9..a7a36cb 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionRequestEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RegisterPartitionRequestWork.java
@@ -24,11 +24,11 @@
import edu.uci.ics.hyracks.control.common.job.PartitionRequest;
import edu.uci.ics.hyracks.control.common.work.AbstractWork;
-public class RegisterPartitionRequestEvent extends AbstractWork {
+public class RegisterPartitionRequestWork extends AbstractWork {
private final ClusterControllerService ccs;
private final PartitionRequest partitionRequest;
- public RegisterPartitionRequestEvent(ClusterControllerService ccs, PartitionRequest partitionRequest) {
+ public RegisterPartitionRequestWork(ClusterControllerService ccs, PartitionRequest partitionRequest) {
this.ccs = ccs;
this.partitionRequest = partitionRequest;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RemoveDeadNodesEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RemoveDeadNodesWork.java
similarity index 94%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RemoveDeadNodesEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RemoveDeadNodesWork.java
index 01ef1c5..889faa2 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RemoveDeadNodesEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/RemoveDeadNodesWork.java
@@ -26,12 +26,12 @@
import edu.uci.ics.hyracks.control.cc.job.JobRun;
import edu.uci.ics.hyracks.control.common.work.AbstractWork;
-public class RemoveDeadNodesEvent extends AbstractWork {
- private static Logger LOGGER = Logger.getLogger(RemoveDeadNodesEvent.class.getName());
+public class RemoveDeadNodesWork extends AbstractWork {
+ private static Logger LOGGER = Logger.getLogger(RemoveDeadNodesWork.class.getName());
private final ClusterControllerService ccs;
- public RemoveDeadNodesEvent(ClusterControllerService ccs) {
+ public RemoveDeadNodesWork(ClusterControllerService ccs) {
this.ccs = ccs;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ReportProfilesEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ReportProfilesWork.java
similarity index 90%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ReportProfilesEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ReportProfilesWork.java
index 1dea174..df12ee9 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ReportProfilesEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/ReportProfilesWork.java
@@ -24,11 +24,11 @@
import edu.uci.ics.hyracks.control.common.job.profiling.om.JobProfile;
import edu.uci.ics.hyracks.control.common.work.AbstractWork;
-public class ReportProfilesEvent extends AbstractWork {
+public class ReportProfilesWork extends AbstractWork {
private final ClusterControllerService ccs;
private final List<JobProfile> profiles;
- public ReportProfilesEvent(ClusterControllerService ccs, List<JobProfile> profiles) {
+ public ReportProfilesWork(ClusterControllerService ccs, List<JobProfile> profiles) {
this.ccs = ccs;
this.profiles = profiles;
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskCompleteEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskCompleteWork.java
similarity index 89%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskCompleteEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskCompleteWork.java
index 6562a90..0d12c65 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskCompleteEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskCompleteWork.java
@@ -21,8 +21,8 @@
import edu.uci.ics.hyracks.control.cc.job.ActivityCluster;
import edu.uci.ics.hyracks.control.cc.job.TaskAttempt;
-public class TaskCompleteEvent extends AbstractTaskLifecycleEvent {
- public TaskCompleteEvent(ClusterControllerService ccs, JobId jobId, TaskAttemptId taId, String nodeId) {
+public class TaskCompleteWork extends AbstractTaskLifecycleWork {
+ public TaskCompleteWork(ClusterControllerService ccs, JobId jobId, TaskAttemptId taId, String nodeId) {
super(ccs, jobId, taId, nodeId);
}
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskFailureEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskFailureWork.java
similarity index 89%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskFailureEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskFailureWork.java
index d456693..31f0872 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskFailureEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/TaskFailureWork.java
@@ -20,10 +20,10 @@
import edu.uci.ics.hyracks.control.cc.job.ActivityCluster;
import edu.uci.ics.hyracks.control.cc.job.TaskAttempt;
-public class TaskFailureEvent extends AbstractTaskLifecycleEvent {
+public class TaskFailureWork extends AbstractTaskLifecycleWork {
private final Exception exception;
- public TaskFailureEvent(ClusterControllerService ccs, JobId jobId, TaskAttemptId taId, String nodeId,
+ public TaskFailureWork(ClusterControllerService ccs, JobId jobId, TaskAttemptId taId, String nodeId,
Exception exception) {
super(ccs, jobId, taId, nodeId);
this.exception = exception;
diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/UnregisterNodeEvent.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/UnregisterNodeWork.java
similarity index 89%
rename from hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/UnregisterNodeEvent.java
rename to hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/UnregisterNodeWork.java
index a3bb0db..32ddba9 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/UnregisterNodeEvent.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/work/UnregisterNodeWork.java
@@ -20,11 +20,11 @@
import edu.uci.ics.hyracks.control.cc.NodeControllerState;
import edu.uci.ics.hyracks.control.common.work.SynchronizableWork;
-public class UnregisterNodeEvent extends SynchronizableWork {
+public class UnregisterNodeWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final String nodeId;
- public UnregisterNodeEvent(ClusterControllerService ccs, String nodeId) {
+ public UnregisterNodeWork(ClusterControllerService ccs, String nodeId) {
this.ccs = ccs;
this.nodeId = nodeId;
}