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/04/08 17:02:54 UTC

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

Author: degenaro
Date: Tue Apr  8 15:02:54 2014
New Revision: 1585752

URL: http://svn.apache.org/r1585752
Log:
UIMA-3725 DUCC Job Driver (JD) hangs if an Error occurs during initialization phase

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/JobDriverTerminateException.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=1585752&r1=1585751&r2=1585752&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 Apr  8 15:02:54 2014
@@ -208,7 +208,11 @@ public class JobDriver extends Thread im
 			throw new JobDriverTerminateException("initialize failed", e);
 		}
 		catch(Throwable t) {
-			throw new JobDriverTerminateException(t);
+			duccOut.error(location, jobid, t);
+			duccErr.error(location, jobid, t);
+			driverStatusReport.setInitializingFailed(new Rationale("job driver exception occurred: "+summarize(t)));
+			terminate();
+			throw new JobDriverTerminateException("initialize failed", t);
 		}
 	}
 	
@@ -220,9 +224,9 @@ public class JobDriver extends Thread im
 		queue = new LinkedBlockingQueue<Runnable>();
 		executor = new DynamicThreadPoolExecutor(1, 1, 10, TimeUnit.MICROSECONDS, queue, factory, job.getDuccId());
 	}
-	
-	public String summarize(Exception e) {
-		return ExceptionHelper.summarize(e);
+
+	public String summarize(Throwable t) {
+		return ExceptionHelper.summarize(t);
 	}
 	
 	public void run() {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverTerminateException.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverTerminateException.java?rev=1585752&r1=1585751&r2=1585752&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverTerminateException.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverTerminateException.java Tue Apr  8 15:02:54 2014
@@ -22,12 +22,8 @@ public class JobDriverTerminateException
 
 	private static final long serialVersionUID = 1L;
 
-	public JobDriverTerminateException(Throwable t) {
-		super(t);
-	}
-	
-	public JobDriverTerminateException(String reason, Exception e) {
-		super(reason, e);
+	public JobDriverTerminateException(String reason, Throwable t) {
+		super(reason, t);
 	}
 	
 	public JobDriverTerminateException(String reason) {