You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/01/15 18:26:48 UTC

svn commit: r1433538 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd: JobDriver.java JobDriverComponent.java

Author: cwiklik
Date: Tue Jan 15 17:26:48 2013
New Revision: 1433538

URL: http://svn.apache.org/viewvc?rev=1433538&view=rev
Log:
UIMA-2572 comitting for jim

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/JobDriverComponent.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=1433538&r1=1433537&r2=1433538&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 Tue Jan 15 17:26:48 2013
@@ -117,6 +117,7 @@ public class JobDriver extends Thread im
 		super();
 	}
 	
+	@Override
 	public void initialize(IDuccWorkJob job, String jdJmxUrl) throws JobDriverTerminateException {
 		String location = "initialize";
 		duccOut.info(location, jobid, "jd.step:"+location);
@@ -755,16 +756,19 @@ public class JobDriver extends Thread im
 	
 	// ==========
 	
+	@Override
 	public CasDispatchMap getCasDispatchMap() {
 		return casDispatchMap;
 	}
 
+	@Override
 	public IDuccWorkJob getJob() {
 		synchronized(job) {
 			return job;
 		}
 	}
 	
+	@Override
 	public void setJob(IDuccWorkJob job) {
 		String location = "setJob";
 		if(job != null) {
@@ -782,22 +786,26 @@ public class JobDriver extends Thread im
 		}
 	}
 	
+	@Override
 	public DriverStatusReport getDriverStatusReportLive() {
 		synchronized (driverStatusReport) {
 			return driverStatusReport;
 		}
 	}
 	
+	@Override
 	public DriverStatusReport getDriverStatusReportCopy() {
 		//synchronized (driverStatusReport) {
 			return driverStatusReport.deepCopy();
 		//}
 	}
 	
+	@Override
 	public WorkItemStateManager getWorkItemStateManager() {
 		return workItemStateManager;
 	}
 	
+	@Override
 	public PerformanceSummaryWriter getPerformanceSummaryWriter() {
 		return performanceSummaryWriter;
 	}
@@ -935,6 +943,7 @@ public class JobDriver extends Thread im
 	
 	/**/
 	
+	@Override
 	public void assignLocation(IJobDriver jobDriver, String casId, String nodeIP, String PID) {
 		String location = "assignLocation";
 		try {
@@ -982,6 +991,7 @@ public class JobDriver extends Thread im
 		return pwiMap;
 	}
 	
+	@Override
 	public void accountingWorkItemIsDispatch(DuccId processId) {
 		String location = "accountingWorkItemIsDispatch";
 		try {
@@ -992,6 +1002,7 @@ public class JobDriver extends Thread im
 		}
 	}
 
+	@Override
 	public void accountingWorkItemIsPreempt(DuccId processId) {
 		String location = "accountingWorkItemIsPreempt";
 		try {
@@ -1002,6 +1013,7 @@ public class JobDriver extends Thread im
 		}
 	}
 
+	@Override
 	public void accountingWorkItemIsRetry(DuccId processId) {
 		String location = "accountingWorkItemIsRetry";
 		try {
@@ -1076,6 +1088,7 @@ public class JobDriver extends Thread im
 		return retVal;
 	}
 	
+	@Override
 	public void start(WorkItem workItem) {
 		String location = "start";
 		try {
@@ -1096,6 +1109,7 @@ public class JobDriver extends Thread im
 		return;
 	}
 
+	@Override
 	public void ended(WorkItem workItem) {
 		String location = "ended";
 		try {
@@ -1183,6 +1197,7 @@ public class JobDriver extends Thread im
 		}
 	}
 	
+	@Override
 	public void exception(WorkItem workItem, Exception e) {
 		String location = "exception";
 		try {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverComponent.java?rev=1433538&r1=1433537&r2=1433538&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverComponent.java Tue Jan 15 17:26:48 2013
@@ -228,7 +228,13 @@ implements IJobDriverComponent {
 			duccOut.debug(methodName, null, duccMsg.fetch("workItemStateManager is null"));
 		}
 		else {
-			workItemStateManager.exportData();
+			try {
+				workItemStateManager.exportData();
+			}
+			catch(Exception e) {
+				duccOut.error(methodName, null, e);
+			}
+			
 		}
 		
 	}
@@ -264,6 +270,7 @@ implements IJobDriverComponent {
 		return jdStateDuccEvent;
 	}
 	
+	@Override
 	public void evaluateJobDriverConstraints(OrchestratorAbbreviatedStateDuccEvent duccEvent) {
 		String methodName = "evaluateDispatchedJobConstraints";
 		duccOut.trace(methodName, null, duccMsg.fetch("enter"));