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 12:09:32 UTC
svn commit: r1496865 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event:
common/DuccSchedulingInfo.java common/IDuccCompletionType.java
common/IDuccSchedulingInfo.java jd/DriverStatusReport.java
Author: degenaro
Date: Wed Jun 26 10:09:32 2013
New Revision: 1496865
URL: http://svn.apache.org/r1496865
Log:
UIMA-2987 DUCC job driver (JD) should reap unprocessed work items
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccSchedulingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccCompletionType.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccSchedulingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DriverStatusReport.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccSchedulingInfo.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/DuccSchedulingInfo.java?rev=1496865&r1=1496864&r2=1496865&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccSchedulingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccSchedulingInfo.java Wed Jun 26 10:09:32 2013
@@ -51,6 +51,7 @@ public class DuccSchedulingInfo implemen
private String workItemsDispatched = defaultWorkItemsDispatched;
private String workItemsError = defaultWorkItemsError;
private String workItemsRetry = defaultWorkItemsRetry;
+ private String workItemsLost = defaultWorkItemsLost;
private String workItemsPreempt= defaultWorkItemsPreempt;
private ConcurrentHashMap<Integer,DuccId> limboMap = new ConcurrentHashMap<Integer,DuccId>();
@@ -308,6 +309,23 @@ public class DuccSchedulingInfo implemen
}
+ public String getWorkItemsLost() {
+ return workItemsLost;
+ }
+
+
+ public void setWorkItemsLost(String number) {
+ if(number != null) {
+ this.workItemsLost = number;
+ }
+ }
+
+
+ public int getIntWorkItemsLost() {
+ return Integer.parseInt(workItemsLost);
+ }
+
+
public String getWorkItemsPreempt() {
if(workItemsPreempt == null) {
workItemsPreempt = "0";
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccCompletionType.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/IDuccCompletionType.java?rev=1496865&r1=1496864&r2=1496865&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccCompletionType.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccCompletionType.java Wed Jun 26 10:09:32 2013
@@ -24,6 +24,7 @@ public interface IDuccCompletionType ext
public enum JobCompletionType {
Premature, // Job was terminated, but not all work items processed
+ Lost, // Job was terminated, but with lost work items (only, no error work items)
EndOfJob, // Job finished without error
Error, // Job finished with error
CanceledByUser, // Job was canceled by user
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccSchedulingInfo.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/IDuccSchedulingInfo.java?rev=1496865&r1=1496864&r2=1496865&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccSchedulingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccSchedulingInfo.java Wed Jun 26 10:09:32 2013
@@ -49,6 +49,7 @@ public interface IDuccSchedulingInfo ext
public static final String defaultWorkItemsDispatched = "0";
public static final String defaultWorkItemsError = "0";
public static final String defaultWorkItemsRetry = "0";
+ public static final String defaultWorkItemsLost = "0";
public static final String defaultWorkItemsPreempt = "0";
@Deprecated
public static final String defaultWorkItemsPending = "unknown";
@@ -114,6 +115,11 @@ public interface IDuccSchedulingInfo ext
public String getWorkItemsRetry();
public void setWorkItemsRetry(String number);
+ public String getWorkItemsLost();
+ public void setWorkItemsLost(String number);
+
+ public int getIntWorkItemsLost();
+
public String getWorkItemsPreempt();
public void setWorkItemsPreempt(String number);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DriverStatusReport.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/DriverStatusReport.java?rev=1496865&r1=1496864&r2=1496865&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DriverStatusReport.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/DriverStatusReport.java Wed Jun 26 10:09:32 2013
@@ -73,6 +73,7 @@ public class DriverStatusReport implemen
//private AtomicInteger workItemsQueued = new AtomicInteger(0);
//private AtomicInteger workItemsDequeued = new AtomicInteger(0);
+ private AtomicInteger workItemsLost = new AtomicInteger(0);
private AtomicInteger workItemsRetry = new AtomicInteger(0);
private AtomicInteger workItemsPreempted = new AtomicInteger(0);
@@ -366,6 +367,16 @@ public class DriverStatusReport implemen
return workItemsProcessingError.get();
}
+ public void countWorkItemsLost() {
+ workItemsLost.incrementAndGet();
+ calculateState();
+ logReport();
+ }
+
+ public int getWorkItemsLost() {
+ return workItemsLost.get();
+ }
+
public void countWorkItemsRetry() {
workItemsRetry.incrementAndGet();
calculateState();