Author: degenaro
Date: Fri Oct 31 20:08:43 2014
New Revision: 1635851
URL: http://svn.apache.org/r1635851
Log:
UIMA-4078 DUCC Job Driver (JD) report users should employ interface, rather
than class directly
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java?rev=1635851&r1=1635850&r2=1635851&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java
Fri Oct 31 20:08:43 2014
@@ -39,7 +39,7 @@ import org.apache.uima.ducc.orchestrator
import org.apache.uima.ducc.orchestrator.utilities.TrackSync;
import org.apache.uima.ducc.transport.event.common.DuccWorkMap;
import
org.apache.uima.ducc.transport.event.common.history.HistoryPersistenceManager;
-import org.apache.uima.ducc.transport.event.jd.DriverStatusReport;
+import org.apache.uima.ducc.transport.event.jd.IDriverStatusReport;
public class OrchestratorCommonArea {
@@ -128,7 +128,7 @@ public class OrchestratorCommonArea {
initSeqNo();
setDuccIdFactory(new
DuccIdFactory(propertiesFileManager,constSeqNo));
workMap = new DuccWorkMap();
- driverStatusReportMap = new
ConcurrentHashMap<DuccId,DriverStatusReport>();
+ driverStatusReportMap = new
ConcurrentHashMap<DuccId,IDriverStatusReport>();
processAccounting = new ProcessAccounting();
OrchestratorCheckpoint.getInstance().switchOnOff(commonConfiguration.orchestratorCheckpoint);
OrchestratorCheckpoint.getInstance().restoreState();
@@ -224,13 +224,13 @@ public class OrchestratorCommonArea {
// **********
- private ConcurrentHashMap<DuccId,DriverStatusReport>
driverStatusReportMap = null;
+ private ConcurrentHashMap<DuccId,IDriverStatusReport>
driverStatusReportMap = null;
- public ConcurrentHashMap<DuccId,DriverStatusReport>
getDriverStatusReportMap() {
+ public ConcurrentHashMap<DuccId,IDriverStatusReport>
getDriverStatusReportMap() {
return driverStatusReportMap;
}
- public void
setDriverStatusReportMap(ConcurrentHashMap<DuccId,DriverStatusReport>
driverStatusReportMap) {
+ public void
setDriverStatusReportMap(ConcurrentHashMap<DuccId,IDriverStatusReport>
driverStatusReportMap) {
this.driverStatusReportMap = driverStatusReportMap;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1635851&r1=1635850&r2=1635851&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
Fri Oct 31 20:08:43 2014
@@ -87,7 +87,7 @@ import org.apache.uima.ducc.transport.ev
import
org.apache.uima.ducc.transport.event.common.IResourceState.ResourceState;
import org.apache.uima.ducc.transport.event.common.ITimeWindow;
import org.apache.uima.ducc.transport.event.common.Rationale;
-import org.apache.uima.ducc.transport.event.jd.DriverStatusReport;
+import org.apache.uima.ducc.transport.event.jd.IDriverStatusReport;
import org.apache.uima.ducc.transport.event.rm.IRmJobState;
import org.apache.uima.ducc.transport.event.sm.ServiceMap;
import org.springframework.beans.factory.annotation.Autowired;
@@ -360,7 +360,7 @@ implements Orchestrator {
public void reconcileJdState(JdStateDuccEvent duccEvent) {
String methodName = "reconcileJdState";
- DriverStatusReport dsr = duccEvent.getState();
+ IDriverStatusReport dsr = duccEvent.getState();
DuccId duccId = null;
if(dsr != null) {
duccId = dsr.getDuccId();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java?rev=1635851&r1=1635850&r2=1635851&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Fri Oct 31 20:08:43 2014
@@ -44,7 +44,7 @@ import org.apache.uima.ducc.transport.ev
import
org.apache.uima.ducc.transport.event.common.IResourceState.ResourceState;
import org.apache.uima.ducc.transport.event.common.ITimeWindow;
import org.apache.uima.ducc.transport.event.common.TimeWindow;
-import org.apache.uima.ducc.transport.event.jd.DriverStatusReport;
+import org.apache.uima.ducc.transport.event.jd.IDriverStatusReport;
public class ProcessAccounting {
@@ -731,7 +731,7 @@ public class ProcessAccounting {
return;
}
- public boolean setStatus(DriverStatusReport jdStatusReport, DuccWorkJob
duccWorkJob) {
+ public boolean setStatus(IDriverStatusReport jdStatusReport,
DuccWorkJob duccWorkJob) {
String methodName = "setStatus";
logger.trace(methodName, null, messages.fetch("enter"));
boolean retVal = false;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1635851&r1=1635850&r2=1635851&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Fri Oct 31 20:08:43 2014
@@ -68,7 +68,7 @@ import org.apache.uima.ducc.transport.ev
import
org.apache.uima.ducc.transport.event.common.IResourceState.ResourceState;
import org.apache.uima.ducc.transport.event.common.Rationale;
import
org.apache.uima.ducc.transport.event.common.history.HistoryPersistenceManager;
-import org.apache.uima.ducc.transport.event.jd.DriverStatusReport;
+import org.apache.uima.ducc.transport.event.jd.IDriverStatusReport;
import org.apache.uima.ducc.transport.event.jd.DuccProcessWorkItemsMap;
import org.apache.uima.ducc.transport.event.rm.IResource;
import org.apache.uima.ducc.transport.event.rm.IRmJobState;
@@ -99,7 +99,7 @@ public class StateManager {
private OrchestratorCommonArea orchestratorCommonArea =
OrchestratorCommonArea.getInstance();
private Messages messages = orchestratorCommonArea.getSystemMessages();
private DuccWorkMap workMap = orchestratorCommonArea.getWorkMap();
- private ConcurrentHashMap<DuccId,DriverStatusReport>
driverStatusReportMap = orchestratorCommonArea.getDriverStatusReportMap();
+ private ConcurrentHashMap<DuccId,IDriverStatusReport>
driverStatusReportMap = orchestratorCommonArea.getDriverStatusReportMap();
private StateJobAccounting stateJobAccounting =
StateJobAccounting.getInstance();
HistoryPersistenceManager hpm =
orchestratorCommonArea.getHistoryPersistencemanager();
@@ -324,7 +324,7 @@ public class StateManager {
}
}
- private void copyInvestmentReport(DuccWorkJob job, DriverStatusReport
jdStatusReport) {
+ private void copyInvestmentReport(DuccWorkJob job, IDriverStatusReport
jdStatusReport) {
String methodName = "copyInvestmentReport";
try {
ConcurrentHashMap<RemoteLocation, Long> omMap =
jdStatusReport.getOperatingMillisMap();
@@ -349,7 +349,7 @@ public class StateManager {
}
}
- private void copyProcessWorkItemsReport(DuccWorkJob job,
DriverStatusReport jdStatusReport) {
+ private void copyProcessWorkItemsReport(DuccWorkJob job,
IDriverStatusReport jdStatusReport) {
String methodName = "copyProcessWorkItemsReport";
try {
IDuccProcessMap processMap = job.getProcessMap();
@@ -368,7 +368,7 @@ public class StateManager {
}
}
- private void copyDriverWorkItemsReport(DuccWorkJob job,
DriverStatusReport jdStatusReport) {
+ private void copyDriverWorkItemsReport(DuccWorkJob job,
IDriverStatusReport jdStatusReport) {
String methodName = "copyDriverWorkItemsReport";
try {
DuccProcessWorkItemsMap pwiMap =
jdStatusReport.getDuccProcessWorkItemsMap();
@@ -396,7 +396,7 @@ public class StateManager {
}
}
- private void setCompletionIfNotAlreadySet(DuccWorkJob duccWorkJob,
DriverStatusReport jdStatusReport) {
+ private void setCompletionIfNotAlreadySet(DuccWorkJob duccWorkJob,
IDriverStatusReport jdStatusReport) {
String methodName = "setCompletionIfNotAlreadySet";
DuccId jobid = null;
try {
@@ -445,7 +445,7 @@ public class StateManager {
/**
* JD reconciliation
*/
- public void reconcileState(DriverStatusReport jdStatusReport) {
+ public void reconcileState(IDriverStatusReport jdStatusReport) {
String methodName = "reconcileState (JD)";
logger.trace(methodName, null, messages.fetch("enter"));
int changes = 0;
@@ -607,7 +607,7 @@ public class StateManager {
logger.trace(methodName, null, messages.fetch("exit"));
}
- public boolean isExcessCapacity(DuccWorkJob job, DriverStatusReport
jdStatusReport) {
+ public boolean isExcessCapacity(DuccWorkJob job, IDriverStatusReport
jdStatusReport) {
String methodName = "isExcessCapacity";
boolean retVal = false;
if(jdStatusReport != null) {
@@ -637,7 +637,7 @@ public class StateManager {
return retVal;
}
- private boolean deallocateIdleProcesses(DuccWorkJob job,
DriverStatusReport jdStatusReport) {
+ private boolean deallocateIdleProcesses(DuccWorkJob job,
IDriverStatusReport jdStatusReport) {
String methodName = "deallocateIdleProcesses";
boolean retVal = false;
if(!jdStatusReport.isPending() &&
!jdStatusReport.isWorkItemPendingProcessAssignment()) {
@@ -663,7 +663,7 @@ public class StateManager {
return retVal;
}
- private boolean deallocateFailedProcesses(DuccWorkJob job,
DriverStatusReport jdStatusReport) {
+ private boolean deallocateFailedProcesses(DuccWorkJob job,
IDriverStatusReport jdStatusReport) {
String methodName = "deallocateFailedProcesses";
boolean retVal = false;
IDuccProcessMap processMap = job.getProcessMap();
@@ -686,7 +686,7 @@ public class StateManager {
}
- private boolean deallocateJobDriver(DuccWorkJob job, DriverStatusReport
jdStatusReport) {
+ private boolean deallocateJobDriver(DuccWorkJob job,
IDriverStatusReport jdStatusReport) {
String methodName = "deallocateJobDriver";
boolean retVal = false;
IDuccProcessMap processMap = job.getDriver().getProcessMap();
