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/03 22:12:42 UTC
svn commit: r1656922 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container:
common/Standardize.java jd/fsm/wi/WiFsm.java jd/wi/WiTracker.java
Author: degenaro
Date: Tue Feb 3 21:12:41 2015
New Revision: 1656922
URL: http://svn.apache.org/r1656922
Log:
UIMA-4068 DUCC Job Driver (JD) user classpath
provide full stack trace in JD log when CR throws an exception
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java?rev=1656922&r1=1656921&r2=1656922&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java Tue Feb 3 21:12:41 2015
@@ -58,6 +58,7 @@ public class Standardize {
request,
result,
remainder,
+ jdObject,
jdState,
directory,
node,
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java?rev=1656922&r1=1656921&r2=1656922&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java Tue Feb 3 21:12:41 2015
@@ -140,12 +140,21 @@ public class WiFsm extends Fsm {
@Override
public void transition(IEvent event, Object actionData) throws FsmException {
+ String location = "transition";
try {
super.transition(event, actionData);
}
catch(Exception e) {
ErrorLogger.record(e);
- JobDriver.getInstance().killJob(CompletionType.Exception);
+ JobDriver jd = JobDriver.getInstance();
+ if(jd != null) {
+ jd.killJob(CompletionType.Exception);
+ }
+ else {
+ MessageBuffer mb = new MessageBuffer();
+ mb.append(Standardize.Label.jdObject.name()+null);
+ logger.warn(location, ILogger.null_id, mb.toString());
+ }
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java?rev=1656922&r1=1656921&r2=1656922&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java Tue Feb 3 21:12:41 2015
@@ -86,12 +86,12 @@ public class WiTracker {
String location = "report";
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.size.get()+map.size());
- logger.debug(location, ILogger.null_id, mb.toString());
+ logger.trace(location, ILogger.null_id, mb.toString());
for(Entry<IRemoteWorkerThread, IWorkItem> entry : map.entrySet()) {
IRemoteWorkerThread rwt = entry.getKey();
IWorkItem wi = entry.getValue();
MessageBuffer mb1 = LoggerHelper.getMessageBuffer(rwt, wi);
- logger.debug(location, ILogger.null_id, mb1.toString());
+ logger.trace(location, ILogger.null_id, mb1.toString());
}
}
}