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/02/17 14:30:45 UTC

svn commit: r1568983 - in /uima/sandbox/uima-ducc/trunk: src/main/resources/ducc.properties uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItemListener.java

Author: degenaro
Date: Mon Feb 17 13:30:45 2014
New Revision: 1568983

URL: http://svn.apache.org/r1568983
Log:
UIMA-3623 DUCC Job Driver (JD) UIMA-AS CAS RefIf tracking

Modified:
    uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties
    uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItemListener.java

Modified: uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties?rev=1568983&r1=1568982&r2=1568983&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties Mon Feb 17 13:30:45 2014
@@ -219,6 +219,10 @@ ducc.jd.share.quantum = 400
 ducc.threads.limit    = 500
 # Extra JVM args to be appended to any user-supplied "driver_jvm_args"
 # Dynamic: changes to this property immediately affect new submitted work
+# Flag: -DUimaAsCasTracking will add to logs: 
+        UIMA-AS client & service trigger internal tracing including RefId,
+        UIMA-AS client onBeforeMessageSendHandler callbacks including RefId, and
+        UIMA-AS client onBeforeProcessCAS callbacks including RefId
 # Flag: -DUimaAsClientTracking will add to jd.out.log: 
         core pool size changes, 
         UIMA-AS client sendAndReceive invocations, 

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItemListener.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItemListener.java?rev=1568983&r1=1568982&r2=1568983&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItemListener.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItemListener.java Mon Feb 17 13:30:45 2014
@@ -36,6 +36,9 @@ public class WorkItemListener extends Ui
 	private IJobDriver jobDriver;
 	private DuccId jobid;
 	
+	private String keyUimaAsCasTracking = "UimaAsCasTracking";
+	private boolean uimaAsCasTracking = false;
+	
 	private String keyUimaAsClientTracking = "UimaAsClientTracking";
 	private boolean uimaAsClientTracking = false;
 	
@@ -50,6 +53,9 @@ public class WorkItemListener extends Ui
 		super();
 		this.jobDriver = jobDriver;
 		this.jobid = jobDriver.getJob().getDuccId();
+		if(System.getProperty(keyUimaAsCasTracking) != null) {
+			uimaAsCasTracking = true;
+		}
 		if(System.getProperty(keyUimaAsClientTracking) != null) {
 			uimaAsClientTracking = true;
 		}
@@ -62,7 +68,10 @@ public class WorkItemListener extends Ui
 			String casId = ""+status.getCAS().hashCode();
 			WorkItem wi = jobDriver.getWorkItem(casId);
 			int seqNo = wi.getSeqNo();
-			if(uimaAsClientTracking) {
+			if(uimaAsCasTracking) {
+				duccOut.info(methodName, jobid, "seqNo:"+seqNo+" "+"casId:"+casId+" "+"refId:"+status.getCasReferenceId());
+			}
+			else if(uimaAsClientTracking) {
 				duccOut.info(methodName, jobid, "seqNo:"+seqNo+" "+"casId:"+casId+" "+"refId:"+status.getCasReferenceId());
 			}
 			Thread thread = new OnBeforeMessageSendHandler(status);
@@ -151,7 +160,10 @@ public class WorkItemListener extends Ui
 			String casId = ""+status.getCAS().hashCode();
 			WorkItem wi = jobDriver.getWorkItem(casId);
 			int seqNo = wi.getSeqNo();
-			if(uimaAsClientTracking) {
+			if(uimaAsCasTracking) {
+				duccOut.info(methodName, jobid, "seqNo:"+seqNo+" "+"casId:"+casId+" "+"refId:"+status.getCasReferenceId());
+			}
+			else if(uimaAsClientTracking) {
 				duccOut.info(methodName, jobid, "seqNo:"+seqNo+" "+"casId:"+casId+" "+"refId:"+status.getCasReferenceId());
 			}
 			Thread thread = new OnBeforeProcessCASHandler(status, nodeIP, pid);