svn commit: r1685579 - /uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/ErrorHandler.java

[degenaro]

Author: degenaro
Date: Mon Jun 15 13:33:42 2015
New Revision: 1685579

URL: http://svn.apache.org/r1685579
Log:
UIMA-4465 DUCC Job Driver (JD) does not handle work item timeouts properly

Modified:

uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/ErrorHandler.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/ErrorHandler.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/ErrorHandler.java?rev=1685579r1=1685578r2=1685579view=diff
==
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/ErrorHandler.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/ErrorHandler.java
 Mon Jun 15 13:33:42 2015
@@ -115,17 +115,25 @@ public class ErrorHandler implements IEr
}

@Override
-   public IErrorHandlerDirective handle(String serializedCAS, Object 
byteArray) {
+   public IErrorHandlerDirective handle(String serializedCAS, Object 
object) {
ErrorHandlerDirective jdUserDirective = new 
ErrorHandlerDirective();
try {
Throwable userThrowable = null;
if(serializedCAS != null) {
// CAS is provided
}
-   if(byteArray != null) {
-   userThrowable = 
Transformer.deserialize(byteArray);
-   userThrowable.getClass();
-   // Exception is provided
+   if(object != null) {
+   // JD exception (e.g. timeout)
+   if(object instanceof Exception) {
+   userThrowable = (Throwable) object;
+   userThrowable.getClass();
+   }
+   // User code exception
+   else {
+   Object byteArray = object;
+   userThrowable = 
Transformer.deserialize(byteArray);
+   userThrowable.getClass();
+   }
}
jobErrorCount.incrementAndGet();
if(jobErrorCount.get()  jobErrorLimit.get()) {

svn commit: r1685648 - /uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java

[challngr]

Author: challngr
Date: Mon Jun 15 18:01:21 2015
New Revision: 1685648

URL: http://svn.apache.org/r1685648
Log:
UIMA-4358 Misplaced 'return' allowed UIMA-AS jobs in FIXED_SHARE class to be 
evicted under some circumstances.

Modified:

uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java?rev=1685648r1=1685647r2=1685648view=diff
==
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodepoolScheduler.java
 Mon Jun 15 18:01:21 2015
@@ -1252,7 +1252,7 @@ public class NodepoolScheduler
  */
 void howMuchFixed(ArrayListResourceClass rcs)
 {
-   String methodName = howMuchFixedShare;
+   String methodName = howMuchFixed;
 
 if ( logger.isTrace() ) {
 logger.info(methodName, null, Scheduling FIXED SHARE for these 
classes:);
@@ -1321,11 +1321,11 @@ public class NodepoolScheduler
 logger.info(methodName, j.getId(), Deferring, no machines 
big enough for the request. NP, np.getId(), 
 available[, np.countNSharesByOrder(order), 
]);
 }
+return;
 } else {
 logger.info(methodName, j.getId(), Nodepool is out of shares: 
NP, np.getId(), 
 available[, np.countNSharesByOrder(order), ]);
 }
-return;
 }
 
 int granted = getAllotmentForJob(j); // in nshares, processes