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/12/19 22:16:24 UTC
svn commit: r1646872 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-user/src:
main/java/org/apache/uima/ducc/user/jd/
main/java/org/apache/uima/ducc/user/jd/iface/
test/java/org/apache/uima/ducc/user/jd/test/
test/java/org/apache/uima/ducc/user/jd/test/h...
Author: degenaro
Date: Fri Dec 19 21:16:23 2014
New Revision: 1646872
URL: http://svn.apache.org/r1646872
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath
handle "error" work items
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/IJdUserErrorHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserErrorHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/helper/TestJdUserErrorHandler.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java?rev=1646872&r1=1646871&r2=1646872&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java Fri Dec 19 21:16:23 2014
@@ -23,7 +23,7 @@ public class JdUserMetaCas {
private int seqNo = -1;
private String serializedCas = null;
private String documentText = null;
- private Exception exception = null;
+ private String serializedException = null;
public JdUserMetaCas(int seqNo, String serializedCas, String documentText) {
setSeqNo(seqNo);
@@ -31,11 +31,11 @@ public class JdUserMetaCas {
setDocumentText(documentText);
}
- public JdUserMetaCas(int seqNo, String serializedCas, String documentText, Exception exception) {
+ public JdUserMetaCas(int seqNo, String serializedCas, String documentText, String serializedException) {
setSeqNo(seqNo);
setSerializedCas(serializedCas);
setDocumentText(documentText);
- setException(exception);
+ setSerializedException(serializedException);
}
private void setSeqNo(int value) {
@@ -62,12 +62,12 @@ public class JdUserMetaCas {
return documentText;
}
- private void setException(Exception value) {
- exception = value;
+ private void setSerializedException(String value) {
+ serializedException = value;
}
- public Exception getException() {
- return exception;
+ public String getSerializedException() {
+ return serializedException;
}
public void printMe() {
@@ -75,8 +75,8 @@ public class JdUserMetaCas {
sb.append("seq:"+getSeqNo()+" ");
sb.append("id:"+getDocumentText()+" ");
sb.append("cas:"+getSerializedCas()+" ");
- if(exception != null) {
- sb.append("exception:"+getException());
+ if(serializedException != null) {
+ sb.append("exception:"+getSerializedException());
}
System.out.println(sb);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/IJdUserErrorHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/IJdUserErrorHandler.java?rev=1646872&r1=1646871&r2=1646872&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/IJdUserErrorHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/IJdUserErrorHandler.java Fri Dec 19 21:16:23 2014
@@ -20,5 +20,5 @@ package org.apache.uima.ducc.user.jd.ifa
public interface IJdUserErrorHandler {
public void initialize(String initializationData);
- public IJdUserDirective handle(String serializedCAS, Exception exception);
+ public IJdUserDirective handle(String serializedCAS, String serializedException);
}
\ No newline at end of file
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserErrorHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserErrorHandler.java?rev=1646872&r1=1646871&r2=1646872&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserErrorHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserErrorHandler.java Fri Dec 19 21:16:23 2014
@@ -86,13 +86,13 @@ public class JdUserErrorHandler implemen
}
@Override
- public IJdUserDirective handle(String serializedCAS, Exception exception) {
+ public IJdUserDirective handle(String serializedCAS, String serializedException) {
JdUserDirective jdUserDirective = new JdUserDirective();
try {
if(serializedCAS != null) {
// CAS is provided
}
- if(exception != null) {
+ if(serializedException != null) {
// Exception is provided
}
jobErrorCount.incrementAndGet();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java?rev=1646872&r1=1646871&r2=1646872&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java Fri Dec 19 21:16:23 2014
@@ -190,8 +190,8 @@ public class TestSuite {
try {
IJdUserErrorHandler eh = new JdUserErrorHandler();
String serializedCAS = null;
- Exception exception = null;
- IJdUserDirective directive = eh.handle(serializedCAS, exception);
+ String serializedException = null;
+ IJdUserDirective directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == false);
assertTrue(directive.isKillProcess() == false);
assertTrue(directive.isKillWorkItem() == true);
@@ -219,69 +219,69 @@ public class TestSuite {
String serializedCAS = jdUserMetaCas.getSerializedCas();
assertTrue(serializedCAS != null);
//
- Exception exception = null;
+ String serializedException = null;
JdUserErrorHandler eh = null;
IJdUserDirective directive = null;
String plist = null;
int limit = 0;
//
- exception = null;
+ serializedException = null;
eh = new JdUserErrorHandler();
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == false);
assertTrue(directive.isKillProcess() == false);
assertTrue(directive.isKillWorkItem() == true);
//
- exception = new RuntimeException();
+ serializedException = new RuntimeException().toString();
eh = new JdUserErrorHandler();
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == false);
assertTrue(directive.isKillProcess() == false);
assertTrue(directive.isKillWorkItem() == true);
//
limit = 15;
- exception = new RuntimeException();
+ serializedException = new RuntimeException().toString();
eh = new JdUserErrorHandler();
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
for(int i=1; i<limit; i++) {
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == false);
assertTrue(directive.isKillProcess() == false);
assertTrue(directive.isKillWorkItem() == true);
}
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == true);
assertTrue(directive.isKillProcess() == false);
assertTrue(directive.isKillWorkItem() == true);
//
limit = 10;
- exception = new RuntimeException();
+ serializedException = new RuntimeException().toString();
plist = InitializationDataKey.KillJobLimit.name()+"="+limit;
eh = new JdUserErrorHandler(plist);
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
for(int i=1; i<limit; i++) {
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == false);
assertTrue(directive.isKillProcess() == false);
assertTrue(directive.isKillWorkItem() == true);
}
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == true);
assertTrue(directive.isKillProcess() == false);
assertTrue(directive.isKillWorkItem() == true);
//
limit = 20;
- exception = new RuntimeException();
+ serializedException = new RuntimeException().toString();
plist = InitializationDataKey.KillJobLimit.name()+"="+limit;
eh = new JdUserErrorHandler(plist);
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
for(int i=1; i<limit; i++) {
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == false);
assertTrue(directive.isKillProcess() == false);
assertTrue(directive.isKillWorkItem() == true);
}
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == true);
assertTrue(directive.isKillProcess() == false);
assertTrue(directive.isKillWorkItem() == true);
@@ -297,13 +297,13 @@ public class TestSuite {
try {
//
String serializedCAS = null;
- Exception exception = null;
+ String serializedException = null;
TestJdUserErrorHandler eh = null;
IJdUserDirective directive = null;
//
- exception = null;
+ serializedException = null;
eh = new TestJdUserErrorHandler();
- directive = eh.handle(serializedCAS, exception);
+ directive = eh.handle(serializedCAS, serializedException);
assertTrue(directive.isKillJob() == true);
assertTrue(directive.isKillProcess() == true);
assertTrue(directive.isKillWorkItem() == false);
@@ -320,12 +320,12 @@ public class TestSuite {
int seqNo = 1;
String serializedCas = "ABC";
String documentText = "123";
- Exception exception = new RuntimeException("exception text");
- JdUserMetaCas jdUserMetaCas = new JdUserMetaCas(seqNo, serializedCas, documentText, exception);
+ String serializedException = new RuntimeException("exception text").toString();
+ JdUserMetaCas jdUserMetaCas = new JdUserMetaCas(seqNo, serializedCas, documentText, serializedException);
assertTrue(seqNo == jdUserMetaCas.getSeqNo());
assertTrue(serializedCas.equals(jdUserMetaCas.getSerializedCas()));
assertTrue(documentText.equals(jdUserMetaCas.getDocumentText()));
- assertTrue(exception.equals(jdUserMetaCas.getException()));
+ assertTrue(serializedException.equals(jdUserMetaCas.getSerializedException()));
jdUserMetaCas.printMe();
}
catch(Exception e) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/helper/TestJdUserErrorHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/helper/TestJdUserErrorHandler.java?rev=1646872&r1=1646871&r2=1646872&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/helper/TestJdUserErrorHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/helper/TestJdUserErrorHandler.java Fri Dec 19 21:16:23 2014
@@ -25,7 +25,7 @@ import org.apache.uima.ducc.user.jd.ifac
public class TestJdUserErrorHandler extends JdUserErrorHandler {
@Override
- public IJdUserDirective handle(String serializedCAS, Exception e) {
+ public IJdUserDirective handle(String serializedCAS, String e) {
JdUserDirective jdUserDirective = new JdUserDirective();
jdUserDirective.setKillJob();
jdUserDirective.setKillProcess();