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/09/19 14:22:59 UTC
svn commit: r1524709 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator:
OrchestratorComponent.java StateJobAccounting.java
Author: degenaro
Date: Thu Sep 19 12:22:58 2013
New Revision: 1524709
URL: http://svn.apache.org/r1524709
Log:
UIMA-2835 DUCC orchestrator (OR) should bypass WaitingForServices for Managed Reservation (AP) when no service dependencies are specified
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1524709&r1=1524708&r2=1524709&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java Thu Sep 19 12:22:58 2013
@@ -982,7 +982,13 @@ implements Orchestrator {
stateJobAccounting.stateChange(duccWorkJob, JobState.Received);
OrchestratorCheckpoint.getInstance().saveState();
// state: WaitingForServices
- stateJobAccounting.stateChange(duccWorkJob, JobState.WaitingForServices);
+ JobState nextState = JobState.WaitingForServices;
+ if(duccWorkJob.getServiceDependencies() == null) {
+ String message = messages.fetch("bypass")+" "+nextState;
+ logger.debug(methodName, duccWorkJob.getDuccId(), message);
+ nextState = JobState.WaitingForResources;
+ }
+ stateJobAccounting.stateChange(duccWorkJob, nextState);
OrchestratorCheckpoint.getInstance().saveState();
// prepare for reply to submitter
properties.put(JobRequestProperties.key_id, duccWorkJob.getId());
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=1524709&r1=1524708&r2=1524709&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 Thu Sep 19 12:22:58 2013
@@ -204,7 +204,7 @@ public class StateJobAccounting {
case Running: break;
case Undefined: break;
case WaitingForDriver: retVal = true; break;
- case WaitingForResources: break;
+ case WaitingForResources: retVal = true; break;
case WaitingForServices: retVal = true; break;
}
return retVal;