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 2015/02/07 15:31:17 UTC

svn commit: r1658064 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src: main/java/org/apache/uima/ducc/container/common/classloader/ main/java/org/apache/uima/ducc/container/dgen/ main/java/org/apache/uima/ducc/container/dgen/classload/ main/j...

Author: degenaro
Date: Sat Feb  7 14:31:16 2015
New Revision: 1658064

URL: http://svn.apache.org/r1658064
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath

provide full stack trace in JD log when CR throws an exception

Added:
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyException.java   (with props)
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyLogger.java
      - copied, changed from r1658039, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java
Removed:
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java
Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyDeployableGeneration.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java

Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyException.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyException.java?rev=1658064&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyException.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyException.java Sat Feb  7 14:31:16 2015
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.common.classloader;
+
+public class ProxyException extends Exception {
+
+	private static final long serialVersionUID = 1L;
+	
+	public ProxyException() {
+	}
+}

Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyLogger.java (from r1658039, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyLogger.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyLogger.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java&r1=1658039&r2=1658064&rev=1658064&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverUserError.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/classloader/ProxyLogger.java Sat Feb  7 14:31:16 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package org.apache.uima.ducc.container.jd.classload;
+package org.apache.uima.ducc.container.common.classloader;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -25,16 +25,15 @@ import org.apache.uima.ducc.container.co
 import org.apache.uima.ducc.container.common.logger.IComponent;
 import org.apache.uima.ducc.container.common.logger.ILogger;
 import org.apache.uima.ducc.container.common.logger.Logger;
-import org.apache.uima.ducc.container.jd.JobDriverException;
 
-public class ProxyJobDriverUserError {
+public class ProxyLogger {
 
-	private static Logger logger = Logger.getLogger(ProxyJobDriverUserError.class, IComponent.Id.JD.name());
+	private static Logger logger = Logger.getLogger(ProxyLogger.class, IComponent.Id.JD.name());
 	
 	public static void loggifyUserException(Exception e) {
 		String location = "loggifyUserException";
 		if(e != null) {
-			if(e instanceof JobDriverException) {
+			if(e instanceof ProxyException) {
 				Throwable t = e.getCause();
 				if(t instanceof Exception) {
 					Exception cause = (Exception) t;

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java?rev=1658064&r1=1658063&r2=1658064&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java Sat Feb  7 14:31:16 2015
@@ -22,6 +22,7 @@ import java.util.List;
 
 import org.apache.uima.ducc.common.utils.QuotedOptions;
 import org.apache.uima.ducc.container.common.FlagsExtendedHelper;
+import org.apache.uima.ducc.container.common.classloader.ProxyException;
 import org.apache.uima.ducc.container.common.logger.IComponent;
 import org.apache.uima.ducc.container.common.logger.ILogger;
 import org.apache.uima.ducc.container.common.logger.Logger;
@@ -104,6 +105,10 @@ public class DgenManager {
 			logger.error(location, ILogger.null_id, e);
 			throw new DgenException(e);
 		}
+		catch(ProxyException e) {
+			logger.error(location, ILogger.null_id, e);
+			throw new DgenException(e);
+		}
 	}
 	
 	private List<String> convert2List(String input) {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyDeployableGeneration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyDeployableGeneration.java?rev=1658064&r1=1658063&r2=1658064&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyDeployableGeneration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyDeployableGeneration.java Sat Feb  7 14:31:16 2015
@@ -31,6 +31,8 @@ import org.apache.uima.ducc.container.co
 import org.apache.uima.ducc.container.common.MessageBuffer;
 import org.apache.uima.ducc.container.common.Standardize;
 import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
+import org.apache.uima.ducc.container.common.classloader.ProxyException;
+import org.apache.uima.ducc.container.common.classloader.ProxyLogger;
 import org.apache.uima.ducc.container.common.logger.IComponent;
 import org.apache.uima.ducc.container.common.logger.ILogger;
 import org.apache.uima.ducc.container.common.logger.Logger;
@@ -42,7 +44,6 @@ public class ProxyDeployableGeneration {
 	private URLClassLoader urlClassLoader = null;
 
 	private String[] requiredClasses = { 
-			"org.apache.uima.ducc.user.dgen.iface.DeployableGenerationException", 
 			"org.apache.uima.ducc.user.dgen.iface.DeployableGeneration",
 			"org.apache.uima.ducc.user.dgen.iface.IDeployableGeneration",
 			"org.apache.uima.aae.UimaSerializer",
@@ -90,9 +91,8 @@ public class ProxyDeployableGeneration {
 			List<String> aeOverrides, 
 			String ccDescriptor,
 			List<String> ccOverrides
-			) throws ProxyDeployableGenerationException
+			) throws ProxyDeployableGenerationException, ProxyException
 	{
-		String location = "generate";
 		String retVal = null;
 		try {
 			show("directory", directory);
@@ -150,13 +150,12 @@ public class ProxyDeployableGeneration {
 			retVal = dgen;
 		}
 		catch(Exception e) {
-			logger.error(location, ILogger.null_id, e);
-			throw new ProxyDeployableGenerationException(e.toString());
+			ProxyLogger.loggifyUserException(e);
+			throw new ProxyException();
 		}
 		return retVal;
 	}
 	
-	
 	public String generate(
 			String directory, 
 			String id,
@@ -167,9 +166,8 @@ public class ProxyDeployableGeneration {
 			String dgenEndpoint,
 			String dgenFlowController,
 			String referenceByName
-			) throws ProxyDeployableGenerationException
+			) throws ProxyException
 	{
-		String location = "generate";
 		String retVal = null;
 		try {
 			show("directory", directory);
@@ -212,13 +210,12 @@ public class ProxyDeployableGeneration {
 			retVal = dgen;
 		}
 		catch(Exception e) {
-			logger.error(location, ILogger.null_id, e);
-			throw new ProxyDeployableGenerationException(e.toString());
+			ProxyLogger.loggifyUserException(e);
+			throw new ProxyException();
 		}
 		return retVal;
 	}
 	
-	
 	private String getUimaAsDirectory() throws Exception {
 		String location = "getUimaAsDirectory";
 		try {
@@ -263,6 +260,7 @@ public class ProxyDeployableGeneration {
 			throw new ProxyDeployableGenerationException(e);
 		}
 	}
+	
 	private void initialize() throws ProxyDeployableGenerationException {
 		String userClasspath = augmentUserClasspath();
 		urlClassLoader = createClassLoader(userClasspath);

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java?rev=1658064&r1=1658063&r2=1658064&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java Sat Feb  7 14:31:16 2015
@@ -22,6 +22,7 @@ import java.util.concurrent.LinkedBlocki
 
 import org.apache.uima.ducc.container.common.MessageBuffer;
 import org.apache.uima.ducc.container.common.Standardize;
+import org.apache.uima.ducc.container.common.classloader.ProxyException;
 import org.apache.uima.ducc.container.common.logger.IComponent;
 import org.apache.uima.ducc.container.common.logger.ILogger;
 import org.apache.uima.ducc.container.common.logger.Logger;
@@ -50,21 +51,28 @@ public class CasManager {
 			pjdcr = new ProxyJobDriverCollectionReader();
 			casManagerStats.setCrTotal(pjdcr.getTotal());
 		}
-		catch(JobDriverException e) {
+		catch(ProxyException e) {
 			logger.error(location, ILogger.null_id, e);
-			throw e;
+			throw new JobDriverException();
 		}
 	}
 	
 	public IMetaCas getMetaCas() throws JobDriverException {
-		IMetaCas retVal = dequeueMetaCas();
-		if(retVal == null) {
-			retVal = pjdcr.getMetaCas();
-			if(retVal != null) {
-				casManagerStats.incCrGets();
+		String location = "getMetaCas";
+		try {
+			IMetaCas retVal = dequeueMetaCas();
+			if(retVal == null) {
+				retVal = pjdcr.getMetaCas();
+				if(retVal != null) {
+					casManagerStats.incCrGets();
+				}
 			}
+			return retVal;
+		}
+		catch(ProxyException e) {
+			logger.error(location, ILogger.null_id, e);
+			throw new JobDriverException();
 		}
-		return retVal;
 	}
 
 	private IMetaCas dequeueMetaCas() throws JobDriverException {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java?rev=1658064&r1=1658063&r2=1658064&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java Sat Feb  7 14:31:16 2015
@@ -27,10 +27,11 @@ import org.apache.uima.ducc.container.co
 import org.apache.uima.ducc.container.common.MessageBuffer;
 import org.apache.uima.ducc.container.common.Standardize;
 import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
+import org.apache.uima.ducc.container.common.classloader.ProxyException;
+import org.apache.uima.ducc.container.common.classloader.ProxyLogger;
 import org.apache.uima.ducc.container.common.logger.IComponent;
 import org.apache.uima.ducc.container.common.logger.ILogger;
 import org.apache.uima.ducc.container.common.logger.Logger;
-import org.apache.uima.ducc.container.jd.JobDriverException;
 import org.apache.uima.ducc.container.net.impl.MetaCas;
 
 public class ProxyJobDriverCollectionReader {
@@ -65,13 +66,13 @@ public class ProxyJobDriverCollectionRea
 			"org.apache.uima.cas.CAS",
 			};
 	
-	public ProxyJobDriverCollectionReader() throws JobDriverException {
+	public ProxyJobDriverCollectionReader() throws ProxyException {
 		try {
 			initialize();
 		}
 		catch(Exception e) {
-			ProxyJobDriverUserError.loggifyUserException(e);
-			throw new JobDriverException();
+			ProxyLogger.loggifyUserException(e);
+			throw new ProxyException();
 		}
 	}
 	
@@ -90,19 +91,19 @@ public class ProxyJobDriverCollectionRea
 		return retVal;
 	}
 	
-	public int getTotal() throws JobDriverException {
+	public int getTotal() throws ProxyException {
 		int retVal = -1;
 		try {
 			retVal = (Integer)method_getTotal.invoke(instance_JdUserCollectionReader, nullObjectArray);
 		} 
 		catch(Exception e) {
-			ProxyJobDriverUserError.loggifyUserException(e);
-			throw new JobDriverException();
+			ProxyLogger.loggifyUserException(e);
+			throw new ProxyException();
 		}
 		return retVal;
 	}
 	
-	public MetaCas getMetaCas() throws JobDriverException {
+	public MetaCas getMetaCas() throws ProxyException {
 		MetaCas retVal = null;
 		try {
 			method_getJdUserMetaCas = class_JdUserCollectionReader.getMethod(name_getJdUserMetaCas, nullClassArray);
@@ -119,8 +120,8 @@ public class ProxyJobDriverCollectionRea
 			}
 		} 
 		catch(Exception e) {
-			ProxyJobDriverUserError.loggifyUserException(e);
-			throw new JobDriverException();
+			ProxyLogger.loggifyUserException(e);
+			throw new ProxyException();
 		}
 		return retVal;
 	}

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java?rev=1658064&r1=1658063&r2=1658064&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java Sat Feb  7 14:31:16 2015
@@ -24,6 +24,7 @@ import java.net.URLClassLoader;
 
 import org.apache.uima.ducc.common.container.FlagsHelper;
 import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
+import org.apache.uima.ducc.container.common.classloader.ProxyLogger;
 import org.apache.uima.ducc.container.common.logger.IComponent;
 import org.apache.uima.ducc.container.common.logger.ILogger;
 import org.apache.uima.ducc.container.common.logger.Logger;
@@ -51,7 +52,7 @@ public class ProxyJobDriverErrorHandler
 			initialize();
 		}
 		catch(Exception e) {
-			ProxyJobDriverUserError.loggifyUserException(e);
+			ProxyLogger.loggifyUserException(e);
 			throw new JobDriverException();
 		}
 	}

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java?rev=1658064&r1=1658063&r2=1658064&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java Sat Feb  7 14:31:16 2015
@@ -31,8 +31,8 @@ import java.util.List;
 
 import org.apache.uima.ducc.common.container.FlagsHelper;
 import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
+import org.apache.uima.ducc.container.common.classloader.ProxyException;
 import org.apache.uima.ducc.container.dgen.classload.ProxyDeployableGeneration;
-import org.apache.uima.ducc.container.jd.JobDriverException;
 import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverCollectionReader;
 import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverDirective;
 import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverErrorHandler;
@@ -235,7 +235,7 @@ public class TestClassLoading extends AT
 			new ProxyJobDriverCollectionReader();
 			fail("No Exception?");
 		}
-		catch(JobDriverException e) {
+		catch(ProxyException e) {
 			// as expected
 		}
 		catch(Exception e) {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java?rev=1658064&r1=1658063&r2=1658064&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java Sat Feb  7 14:31:16 2015
@@ -26,7 +26,7 @@ import java.net.URL;
 import java.util.ArrayList;
 
 import org.apache.uima.ducc.common.container.FlagsHelper;
-import org.apache.uima.ducc.container.jd.JobDriverException;
+import org.apache.uima.ducc.container.common.classloader.ProxyException;
 import org.apache.uima.ducc.container.jd.cas.CasManager;
 import org.apache.uima.ducc.container.jd.cas.CasManagerStats.RetryReason;
 import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverCollectionReader;
@@ -101,7 +101,7 @@ public class TestSuite extends ATest {
 				new ProxyJobDriverCollectionReader();
 				fail("Exception missing...?");
 			}
-			catch(JobDriverException e) {
+			catch(ProxyException e) {
 				asExpected(e);
 			}
 		}
@@ -131,7 +131,7 @@ public class TestSuite extends ATest {
 			new ProxyJobDriverCollectionReader();
 			fail("Exception missing...?");
 		}
-		catch(JobDriverException e) {
+		catch(ProxyException e) {
 			asExpected(e);
 		}
 		catch(Exception e) {
@@ -200,7 +200,7 @@ public class TestSuite extends ATest {
 		getMetaCas();
 	}
 
-	private void getMetaCases(ProxyJobDriverCollectionReader pjdcr, int total) throws JobDriverException {
+	private void getMetaCases(ProxyJobDriverCollectionReader pjdcr, int total) throws ProxyException {
 		for(int c=1; c <= total; c++) {
 			MetaCas mc = pjdcr.getMetaCas();
 			int seqNo = mc.getSeqNo();