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/04/19 14:10:58 UTC
svn commit: r1469801 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd:
JobDriver.java client/IWorkItemMonitor.java client/WorkItemListener.java
Author: degenaro
Date: Fri Apr 19 12:10:58 2013
New Revision: 1469801
URL: http://svn.apache.org/r1469801
Log:
UIMA-2820 DUCC job Driver (JD) should record UIMA-AS callbacks for queue and dequeue of work items in jd.out.log (at Info level)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/IWorkItemMonitor.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/JobDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java?rev=1469801&r1=1469800&r2=1469801&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java Fri Apr 19 12:10:58 2013
@@ -1089,6 +1089,43 @@ public class JobDriver extends Thread im
}
@Override
+ public WorkItem getWorkItem(String casId) {
+ String location = "getWorkItem";
+ WorkItem workItem = null;
+ if(casId != null) {
+ workItem = casWorkItemMap.get(casId);
+ if(workItem == null) {
+ duccOut.warn(location, jobid, casId);
+ }
+ }
+ return workItem;
+ }
+
+ @Override
+ public void queued(WorkItem workItem) {
+ String location = "queued";
+ try {
+ duccOut.info(location, workItem.getJobId(), workItem.getProcessId(), "seqNo:"+workItem.getSeqNo()+" "+"wiId:"+workItem.getCasDocumentText());
+ }
+ catch(Exception e) {
+ duccOut.error(location, jobid, "processing error?", e);
+ }
+ return;
+ }
+
+ @Override
+ public void dequeued(WorkItem workItem, String node, String pid) {
+ String location = "dequeued";
+ try {
+ duccOut.info(location, workItem.getJobId(), workItem.getProcessId(), "seqNo:"+workItem.getSeqNo()+" "+"wiId:"+workItem.getCasDocumentText()+" "+"node:"+node+" "+"pid:"+pid);
+ }
+ catch(Exception e) {
+ duccOut.error(location, jobid, "processing error?", e);
+ }
+ return;
+ }
+
+ @Override
public void start(WorkItem workItem) {
String location = "start";
try {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/IWorkItemMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/IWorkItemMonitor.java?rev=1469801&r1=1469800&r2=1469801&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/IWorkItemMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/IWorkItemMonitor.java Fri Apr 19 12:10:58 2013
@@ -20,7 +20,11 @@ package org.apache.uima.ducc.jd.client;
public interface IWorkItemMonitor {
+ public WorkItem getWorkItem(String casId);
+
public void start(WorkItem workItem);
+ public void queued(WorkItem workItem);
+ public void dequeued(WorkItem workitem, String node, String pid);
public void ended(WorkItem workitem);
public void exception(WorkItem workitem, 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=1469801&r1=1469800&r2=1469801&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 Fri Apr 19 12:10:58 2013
@@ -57,6 +57,7 @@ public class WorkItemListener extends Ui
ThreadLocation threadLocation = null;
try {
casId = ""+status.getCAS().hashCode();
+ jobDriver.queued(jobDriver.getWorkItem(casId));
threadLocation = jobDriver.getCasDispatchMap().get(casId);
DuccId jobid = jobDriver.getJob().getDuccId();
duccOut.debug(methodName, jobid, "action:send "+threadLocation.getInfo());
@@ -86,11 +87,12 @@ public class WorkItemListener extends Ui
ThreadLocation threadLocation = null;
try {
casId = ""+status.getCAS().hashCode();
+ String PID = pid.split(":")[0];
+ jobDriver.dequeued(jobDriver.getWorkItem(casId), nodeIP, PID);
threadLocation = jobDriver.getCasDispatchMap().get(casId);
threadLocation.setNodeId(nodeIP);
threadLocation.setProcessId(pid);
duccOut.debug(methodName, jobDriver.getJob().getDuccId(), "action:process "+threadLocation.getInfo());
- String PID = pid.split(":")[0];
jobDriver.assignLocation(jobDriver, casId, nodeIP, PID);
jobDriver.getDriverStatusReportLive().workItemOperatingStart(casId, nodeIP, PID);
duccOut.debug(methodName, null, "seqNo:"+threadLocation.getSeqNo()+" "+"casId:"+casId+" "+"node:"+nodeIP+" "+"PID:"+pid);