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 13:29:17 UTC

svn commit: r1568960 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client: DynamicThreadPoolExecutor.java WorkItem.java WorkItemListener.java

Author: degenaro
Date: Mon Feb 17 12:29:17 2014
New Revision: 1568960

URL: http://svn.apache.org/r1568960
Log:
UIMA-3610 DUCC Job Driver (JD) should unambiguously record to log UIMA-AS clientSendAndReceive interactions

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/DynamicThreadPoolExecutor.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItem.java
    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/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/DynamicThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/DynamicThreadPoolExecutor.java?rev=1568960&r1=1568959&r2=1568960&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/DynamicThreadPoolExecutor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/DynamicThreadPoolExecutor.java Mon Feb 17 12:29:17 2014
@@ -44,7 +44,10 @@ public class DynamicThreadPoolExecutor e
 	
 	private DuccId duccId;
 	private Semaphore terminations = new Semaphore(0);
-
+	
+	private String keyUimaAsClientTracking = "UimaAsClientTracking";
+	private boolean uimaAsClientTracking = false;
+	
 	public DynamicThreadPoolExecutor(int corePoolSize, 
 			int maximumPoolSize,
 			long keepAliveTime, 
@@ -57,6 +60,9 @@ public class DynamicThreadPoolExecutor e
 		String methodName = "DynamicThreadPoolExecutor";
 		this.duccId = duccId;
 		duccOut.trace(methodName, duccId, duccMsg.fetch("enter"));
+		if(System.getProperty(keyUimaAsClientTracking) != null) {
+			uimaAsClientTracking = true;
+		}
 		duccOut.trace(methodName, duccId, duccMsg.fetch("exit"));
 	}
     /**
@@ -103,7 +109,9 @@ public class DynamicThreadPoolExecutor e
 			int delta = getMaximumPoolSize() - size;
 			if(delta != 0) {
 				String message = duccMsg.fetch("changing core pool size to")+" "+size+" "+duccMsg.fetch("from")+" "+getMaximumPoolSize();
-				duccOut.info(methodName, duccId, message);
+				if(uimaAsClientTracking) {
+					duccOut.info(methodName, duccId, message);
+				}
 				super.setCorePoolSize(size);
 				super.setMaximumPoolSize(size);
 			}

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItem.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItem.java?rev=1568960&r1=1568959&r2=1568960&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItem.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/WorkItem.java Mon Feb 17 12:29:17 2014
@@ -62,6 +62,9 @@ public class WorkItem implements Runnabl
 	
 	public AtomicBoolean isLost = new AtomicBoolean(false);
 	
+	private String keyUimaAsClientTracking = "UimaAsClientTracking";
+	private boolean uimaAsClientTracking = false;
+	
 	// <for testing only!!!>
 	private final static boolean injectRandom = false;
 	// </for testing only!!!>
@@ -77,6 +80,9 @@ public class WorkItem implements Runnabl
 		this.casTuple = casTuple;
 		this.jobId = jobId;
 		this.workItemMonitor = workItemMonitor;
+		if(System.getProperty(keyUimaAsClientTracking) != null) {
+			uimaAsClientTracking = true;
+		}
 		duccOut.debug(methodName, jobId, duccMsg.fetchLabel("seqNo")+casTuple.getSeqno());
 		duccOut.trace(methodName, jobId, duccMsg.fetch("exit"));
 	}
@@ -138,11 +144,13 @@ public class WorkItem implements Runnabl
 				CAS cas = this.casTuple.getCas();
 				duccOut.debug(methodName, jobId, duccMsg.fetchLabel("CAS.size")+cas.size());
 				callbackState.statePendingQueued();
-				duccOut.debug(methodName, null, "seqNo:"+getSeqNo()+" "+callbackState.getState());
-				duccOut.info(methodName, null, "seqNo:"+getSeqNo()+" "+"send and receive begins...");
+				if(uimaAsClientTracking) {
+					duccOut.info(methodName, null, "seqNo:"+getSeqNo()+" "+"send and receive begins...");
+				}
 				client.sendAndReceiveCAS(cas, analysisEnginePerformanceMetricsList);
-				duccOut.info(methodName, null, "seqNo:"+getSeqNo()+" "+"send and receive returned");
-				duccOut.debug(methodName, null, "seqNo:"+getSeqNo()+" "+"send and receive returned");
+				if(uimaAsClientTracking) {
+					duccOut.info(methodName, null, "seqNo:"+getSeqNo()+" "+"send and receive returned");
+				}
 				// <for testing only!!!>
 				if(injectRandom) {
 					Random random = new Random();
@@ -158,7 +166,9 @@ public class WorkItem implements Runnabl
 					duccOut.debug(methodName, null, "seqNo:"+getSeqNo()+" "+"lost+ended");
 				}
 			} catch(Exception e) {
-				duccOut.error(methodName, null, "seqNo:"+getSeqNo()+" "+"send and receive exception");
+				if(uimaAsClientTracking) {
+					duccOut.error(methodName, null, "seqNo:"+getSeqNo()+" "+"send and receive exception");
+				}
 				if(!isLost.get()) {
 					exception(e);
 				}

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=1568960&r1=1568959&r2=1568960&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 12:29:17 2014
@@ -36,6 +36,9 @@ public class WorkItemListener extends Ui
 	private IJobDriver jobDriver;
 	private DuccId jobid;
 	
+	private String keyUimaAsClientTracking = "UimaAsClientTracking";
+	private boolean uimaAsClientTracking = false;
+	
 	// <for testing only!!!>
 	private final static boolean asynchronous = false;
 	private final static boolean injectLost1 = false;
@@ -47,6 +50,9 @@ public class WorkItemListener extends Ui
 		super();
 		this.jobDriver = jobDriver;
 		this.jobid = jobDriver.getJob().getDuccId();
+		if(System.getProperty(keyUimaAsClientTracking) != null) {
+			uimaAsClientTracking = true;
+		}
 	}
 	
 	@Override
@@ -56,7 +62,9 @@ public class WorkItemListener extends Ui
 			String casId = ""+status.getCAS().hashCode();
 			WorkItem wi = jobDriver.getWorkItem(casId);
 			int seqNo = wi.getSeqNo();
-			duccOut.info(methodName, jobid, "seqNo:"+seqNo+" "+"casId:"+casId);
+			if(uimaAsClientTracking) {
+				duccOut.info(methodName, jobid, "seqNo:"+seqNo+" "+"casId:"+casId+" "+"refId:"+status.getCasReferenceId());
+			}
 			Thread thread = new OnBeforeMessageSendHandler(status);
 			if(asynchronous) {
 				thread.start();
@@ -143,7 +151,9 @@ public class WorkItemListener extends Ui
 			String casId = ""+status.getCAS().hashCode();
 			WorkItem wi = jobDriver.getWorkItem(casId);
 			int seqNo = wi.getSeqNo();
-			duccOut.info(methodName, jobid, "seqNo:"+seqNo+" "+"casId:"+casId);
+			if(uimaAsClientTracking) {
+				duccOut.info(methodName, jobid, "seqNo:"+seqNo+" "+"casId:"+casId+" "+"refId:"+status.getCasReferenceId());
+			}
 			Thread thread = new OnBeforeProcessCASHandler(status, nodeIP, pid);
 			if(asynchronous) {
 				thread.start();