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 2013/06/26 15:47:51 UTC
svn commit: r1496937 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server: DuccHandler.java DuccWebMonitorJob.java

Author: degenaro
Date: Wed Jun 26 13:47:50 2013
New Revision: 1496937

URL: http://svn.apache.org/r1496937
Log:
UIMA-2987 DUCC job driver (JD) should reap unprocessed work items

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1496937&r1=1496936&r2=1496937&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Wed Jun 26 13:47:50 2013
@@ -920,16 +920,27 @@ public class DuccHandler extends DuccAbs
 		}
 		sb.append(done);
 		sb.append("&nbsp");
-		// error
-		sb.append("<th title=\"The number of work items that failed to complete successfully\">");
-		sb.append("Error: ");
-		String error = "0";
+		// error & lost
+		int eCount = 0;
+		int lCount = 0;
 		try {
-			error = ""+job.getSchedulingInfo().getIntWorkItemsError();
+			eCount = job.getSchedulingInfo().getIntWorkItemsError();
+			lCount = job.getSchedulingInfo().getIntWorkItemsLost();
 		}
 		catch(Exception e) {
 		}
+		String error = ""+eCount;
+		sb.append("<th title=\"The number of work items that failed to complete successfully\">");
+		sb.append("Error: ");
 		sb.append(error);
+		if(lCount > 0) {
+			sb.append("&nbsp");
+			String lost = ""+lCount;
+			sb.append("<th title=\"The number of work items that were lost\">");
+			sb.append("Lost: ");
+			sb.append(lost);
+		}
+		// extended info live jobs
 		sb.append("&nbsp");
 		JobState jobState = JobState.Undefined;
 		try {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java?rev=1496937&r1=1496936&r2=1496937&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java Wed Jun 26 13:47:50 2013
@@ -101,8 +101,9 @@ public class DuccWebMonitorJob {
 			IDuccSchedulingInfo si = dw.getSchedulingInfo();
 			monitorInfo.total = si.getWorkItemsTotal();
 			monitorInfo.done  = si.getWorkItemsCompleted();
-			monitorInfo.error = si.getWorkItemsError();
+			monitorInfo.error = ""+si.getIntWorkItemsError();
 			monitorInfo.retry = si.getWorkItemsRetry();
+			monitorInfo.lost = si.getWorkItemsLost();
 			monitorInfo.procs = ""+dwj.getProcessMap().getAliveProcessCount();
 			
 			if(si.getIntWorkItemsError() > 0) {