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 2013/04/26 21:49:33 UTC
svn commit: r1476360 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator:
StateJobAccounting.java StateManager.java
Author: degenaro
Date: Fri Apr 26 19:49:33 2013
New Revision: 1476360
URL: http://svn.apache.org/r1476360
Log:
UIMA-2835 DUCC orchestrator (OR) should skip WaitingForServices when no dependencies are declared
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java?rev=1476360&r1=1476359&r2=1476360&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java Fri Apr 26 19:49:33 2013
@@ -242,7 +242,7 @@ public class StateJobAccounting {
case Running: break;
case Undefined: break;
case WaitingForDriver: break;
- case WaitingForResources: break;
+ case WaitingForResources: retVal = true; break;
case WaitingForServices: retVal = true; break;
}
return retVal;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1476360&r1=1476359&r2=1476360&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java Fri Apr 26 19:49:33 2013
@@ -399,8 +399,14 @@ public class StateManager {
break;
case Initializing:
switch(duccWorkJob.getJobState()) {
- case WaitingForDriver:
- stateJobAccounting.stateChange(duccWorkJob, JobState.WaitingForServices);
+ case WaitingForDriver:
+ JobState nextState = JobState.WaitingForServices;
+ if(duccWorkJob.getServiceDependencies() == null) {
+ String message = messages.fetch("bypass")+" "+nextState;
+ logger.debug(methodName, duccId, message);
+ nextState = JobState.WaitingForResources;
+ }
+ stateJobAccounting.stateChange(duccWorkJob, nextState);
break;
case Initializing:
break;