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 2014/04/23 20:00:07 UTC

svn commit: r1589472 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/workitem/WorkItemStateKeeper.java uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java

Author: degenaro
Date: Wed Apr 23 18:00:06 2014
New Revision: 1589472

URL: http://svn.apache.org/r1589472
Log:
UIMA-3360 DUCC orchestrator (OR) must report "investment" in work items for each JP so RM can make intelligent preemption decisions

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/workitem/WorkItemStateKeeper.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/workitem/WorkItemStateKeeper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/workitem/WorkItemStateKeeper.java?rev=1589472&r1=1589471&r2=1589472&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/workitem/WorkItemStateKeeper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/workitem/WorkItemStateKeeper.java Wed Apr 23 18:00:06 2014
@@ -50,6 +50,11 @@ public class WorkItemStateKeeper extends
 		initialize(directory);
 	}
 	
+	public ConcurrentHashMap<RemoteLocation, Long> getOperatingMillisMap() {
+		DuccLogger logger = null;
+		return getOperatingMillisMap(logger);
+	}
+	
 	public ConcurrentHashMap<RemoteLocation, Long> getOperatingMillisMap(DuccLogger logger) {
 		String location = "getOperatingMillisMap";
 		ConcurrentHashMap<RemoteLocation, Long> map = new ConcurrentHashMap<RemoteLocation, Long>();

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java?rev=1589472&r1=1589471&r2=1589472&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java Wed Apr 23 18:00:06 2014
@@ -1729,6 +1729,7 @@ public class JobDriver extends Thread im
 				driverStatusReport.setWiMillisAvg(stats.millisAvg);
 				driverStatusReport.setWiMillisOperatingLeast(stats.millisOperatingLeast);
 				driverStatusReport.setWiMillisCompletedMost(stats.millisCompletedMost);
+				driverStatusReport.setOperatingMillisMap(workItemStateKeeper.getOperatingMillisMap(duccOut));
 			}
 		}
 		catch(Exception e) {