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/12/16 16:48:02 UTC

svn commit: r1645986 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files: IWorkItemState.java WorkItemState.java workitem/IWorkItemStateKeeper.java workitem/WorkItemStateKeeper.java

Author: degenaro
Date: Tue Dec 16 15:48:01 2014
New Revision: 1645986

URL: http://svn.apache.org/r1645986
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath

Processes tab accounting (for JPs)

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

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/IWorkItemState.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/IWorkItemState.java?rev=1645986&r1=1645985&r2=1645986&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/IWorkItemState.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/IWorkItemState.java Tue Dec 16 15:48:01 2014
@@ -40,6 +40,7 @@ public interface IWorkItemState extends
 		ended,
 		error,
 		retry,
+		preempt,
 		lost,
 		unknown
 	}
@@ -51,6 +52,7 @@ public interface IWorkItemState extends
 	public void stateEnded();
 	public void stateError();
 	public void stateRetry();
+	public void statePreempt();
 	public void stateLost();
 	
 	public long getMillisOverhead();

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemState.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/WorkItemState.java?rev=1645986&r1=1645985&r2=1645986&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemState.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/WorkItemState.java Tue Dec 16 15:48:01 2014
@@ -165,7 +165,11 @@ public class WorkItemState implements IW
 	public void stateRetry() {
 		state = State.retry;
 	}
-
+	
+	
+	public void statePreempt() {
+		state = State.preempt;
+	}
 	
 	public long getMillisOverhead() {
 		long retVal = 0;

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/workitem/IWorkItemStateKeeper.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/IWorkItemStateKeeper.java?rev=1645986&r1=1645985&r2=1645986&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/workitem/IWorkItemStateKeeper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/jd/files/workitem/IWorkItemStateKeeper.java Tue Dec 16 15:48:01 2014
@@ -25,5 +25,6 @@ public interface IWorkItemStateKeeper {
 	public void ended(int seqNo);
 	public void error(int seqNo);
 	public void retry(int seqNo);
+	public void preempt(int seqNo);
 	public void zip();
 }

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=1645986&r1=1645985&r2=1645986&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 Tue Dec 16 15:48:01 2014
@@ -191,6 +191,14 @@ public class WorkItemStateKeeper extends
 		record(wis);
 	}
 	
+	@Override
+	public void preempt(int seqNo) {
+		Long key = new Long(seqNo);
+		IWorkItemState wis = activeMap.get(key);
+		wis.statePreempt();
+		record(wis);
+	}
+	
 	@Deprecated
 	public void location(String seqNo, String node, String pid) {
 		Long key = new Long(seqNo);