You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2015/02/26 16:09:11 UTC
svn commit: r1662474 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport:
configuration/jd/ event/common/ event/jd/ event/jd/v1/
Author: degenaro
Date: Thu Feb 26 15:09:11 2015
New Revision: 1662474
URL: http://svn.apache.org/r1662474
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath
investment reset
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/IDriverStatusReport.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/v1/DriverStatusReportV1.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java?rev=1662474&r1=1662473&r2=1662474&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java Thu Feb 26 15:09:11 2015
@@ -217,6 +217,9 @@ implements IJobDriverComponent {
else if(p.isPreempted()) {
mh.handleProcessPreempt(processInfo);
}
+ else if(p.isVolunteered()) {
+ mh.handleProcessVolunteered(processInfo);
+ }
else {
mh.handleProcessDown(processInfo);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java?rev=1662474&r1=1662473&r2=1662474&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java Thu Feb 26 15:09:11 2015
@@ -359,6 +359,17 @@ public class DuccProcess implements IDuc
}
+ public boolean isVolunteered() {
+ boolean retVal = false;
+ switch(deallocationType) {
+ case Voluntary:
+ retVal = true;
+ break;
+ }
+ return retVal;
+ }
+
+
public boolean isComplete() {
boolean retVal = false;
switch(processState) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java?rev=1662474&r1=1662473&r2=1662474&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java Thu Feb 26 15:09:11 2015
@@ -74,6 +74,7 @@ public interface IDuccProcess extends Se
public boolean isFailed();
public boolean isFailedInitialization();
public boolean isPreempted();
+ public boolean isVolunteered();
public boolean isComplete();
public boolean isAssignedWork();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/IDriverStatusReport.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/IDriverStatusReport.java?rev=1662474&r1=1662473&r2=1662474&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/IDriverStatusReport.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/IDriverStatusReport.java Thu Feb 26 15:09:11 2015
@@ -97,5 +97,5 @@ public interface IDriverStatusReport {
public IDuccProcessWorkItemsReport getDuccProcessWorkItemsMap();
public ConcurrentHashMap<RemoteLocation, Long> getOperatingMillisMap();
-
+ public ConcurrentHashMap<RemoteLocation, Long> getInvestmentMillisMap();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java?rev=1662474&r1=1662473&r2=1662474&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java Thu Feb 26 15:09:11 2015
@@ -79,6 +79,7 @@ public class JobDriverReport implements
private ArrayList<IWorkItemInfo> listActiveWorkItemInfo = null;
private ConcurrentHashMap<RemoteLocation, Long> mapProcessOperatingMillis = null;
+ private ConcurrentHashMap<RemoteLocation, Long> mapProcessInvestmentMillis = null;
private String jpDeployable = null;
@@ -516,4 +517,18 @@ public class JobDriverReport implements
return mapProcessOperatingMillis;
}
+ @Override
+ public ConcurrentHashMap<RemoteLocation, Long> getInvestmentMillisMap() {
+ mapProcessInvestmentMillis = new ConcurrentHashMap<RemoteLocation, Long>();
+ if(listActiveWorkItemInfo != null) {
+ for(IWorkItemInfo wii: listActiveWorkItemInfo) {
+ String nodeIP = wii.getNodeAddress();
+ String PID = ""+wii.getPid();
+ RemoteLocation rl = new RemoteLocation(nodeIP, PID);
+ mapProcessInvestmentMillis.put(rl, wii.getInvestmentMillis());
+ }
+ }
+ return mapProcessInvestmentMillis;
+ }
+
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/v1/DriverStatusReportV1.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/v1/DriverStatusReportV1.java?rev=1662474&r1=1662473&r2=1662474&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/v1/DriverStatusReportV1.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/v1/DriverStatusReportV1.java Thu Feb 26 15:09:11 2015
@@ -846,4 +846,9 @@ public class DriverStatusReportV1 implem
return null;
}
+ @Override
+ public ConcurrentHashMap<RemoteLocation, Long> getInvestmentMillisMap() {
+ return getOperatingMillisMap();
+ }
+
}