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/06/25 15:56:52 UTC
svn commit: r1605407 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator:
StateJobAccounting.java StateManager.java
Author: degenaro
Date: Wed Jun 25 13:56:51 2014
New Revision: 1605407
URL: http://svn.apache.org/r1605407
Log:
UIMA-33915 DUCC Orchestrator (OR) should have a Job state between WaitingFor... and Initializing
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=1605407&r1=1605406&r2=1605407&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 Wed Jun 25 13:56:51 2014
@@ -101,6 +101,9 @@ public class StateJobAccounting {
}
retVal = stateChangeFromCompleted(prev, next);
break;
+ case Assigned:
+ retVal = stateChangeFromAssigned(prev, next);
+ break;
case Initializing:
retVal = stateChangeFromInitializing(prev, next);
break;
@@ -159,6 +162,7 @@ public class StateJobAccounting {
switch(next) {
case Completing: break;
case Completed: retVal = true; break;
+ case Assigned: break;
case Initializing: break;
case Received: break;
case Running: break;
@@ -175,6 +179,7 @@ public class StateJobAccounting {
switch(next) {
case Completing: break;
case Completed: break;
+ case Assigned: break;
case Initializing: break;
case Received: break;
case Running: break;
@@ -186,11 +191,29 @@ public class StateJobAccounting {
return retVal;
}
+ private boolean stateChangeFromAssigned(JobState prev, JobState next) {
+ boolean retVal = false;
+ switch(next) {
+ case Completing: retVal = true; break;
+ case Completed: retVal = true; break;
+ case Assigned: break;
+ case Initializing: retVal = true; break;
+ case Received: break;
+ case Running: retVal = true; break;
+ case Undefined: break;
+ case WaitingForDriver: break;
+ case WaitingForResources: break;
+ case WaitingForServices: break;
+ }
+ return retVal;
+ }
+
private boolean stateChangeFromInitializing(JobState prev, JobState next) {
boolean retVal = false;
switch(next) {
case Completing: retVal = true; break;
case Completed: retVal = true; break;
+ case Assigned: break;
case Initializing: break;
case Received: break;
case Running: retVal = true; break;
@@ -207,6 +230,7 @@ public class StateJobAccounting {
switch(next) {
case Completing: retVal = true; break;
case Completed: retVal = true; break;
+ case Assigned: break;
case Initializing: break;
case Received: break;
case Running: break;
@@ -223,6 +247,7 @@ public class StateJobAccounting {
switch(next) {
case Completing: retVal = true; break;
case Completed: retVal = true; break;
+ case Assigned: break;
case Initializing: break;
case Received: break;
case Running: break;
@@ -239,6 +264,7 @@ public class StateJobAccounting {
switch(next) {
case Completing: break;
case Completed: break;
+ case Assigned: break;
case Initializing: break;
case Received: retVal = true; break;
case Running: break;
@@ -255,6 +281,7 @@ public class StateJobAccounting {
switch(next) {
case Completing: retVal = true; break;
case Completed: retVal = true; break;
+ case Assigned: break;
case Initializing: break;
case Received: break;
case Running: break;
@@ -271,6 +298,7 @@ public class StateJobAccounting {
switch(next) {
case Completing: retVal = true; break;
case Completed: retVal = true; break;
+ case Assigned: retVal = true; break;
case Initializing: retVal = true; break;
case Received: break;
case Running: break;
@@ -287,6 +315,7 @@ public class StateJobAccounting {
switch(next) {
case Completing: retVal = true; break;
case Completed: retVal = true; break;
+ case Assigned: break;
case Initializing: break;
case Received: break;
case Running: break;
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=1605407&r1=1605406&r2=1605407&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 Wed Jun 25 13:56:51 2014
@@ -496,6 +496,9 @@ public class StateManager {
}
stateJobAccounting.stateChange(duccWorkJob, nextState);
break;
+ case Assigned:
+ stateJobAccounting.stateChange(duccWorkJob, JobState.Initializing);
+ break;
case Initializing:
break;
}
@@ -529,6 +532,7 @@ public class StateManager {
case WaitingForDriver:
stateJobAccounting.stateChange(duccWorkJob, JobState.WaitingForServices);
break;
+ case Assigned:
case Initializing:
stateJobAccounting.stateChange(duccWorkJob, JobState.Running);
break;
@@ -773,10 +777,11 @@ public class StateManager {
UserLogging.record(userName, userLogDir, text);
}
if(duccWorkJob.getProcessMap().size() > 0) {
- changes += stateChange(duccWorkJob,JobState.Initializing);
+ changes += stateChange(duccWorkJob,JobState.Assigned);
logger.info(methodName, duccId, messages.fetchLabel("resources count")+duccWorkJob.getProcessMap().size());
}
break;
+ case Assigned:
case Initializing:
case Running:
if(duccWorkJob.getProcessMap().size() == 0) {
@@ -895,6 +900,7 @@ public class StateManager {
UserLogging.record(userName, userLogDir, text);
}
break;
+ case Assigned:
case Initializing:
case Running:
if(duccWorkService.getProcessMap().size() == 0) {
@@ -1227,6 +1233,7 @@ public class StateManager {
case WaitingForResources:
logger.debug(methodName, duccId, messages.fetchLabel("job state")+jobState+" "+messages.fetchLabel("services state")+serviceState);
break;
+ case Assigned:
case Initializing:
case Running:
logger.debug(methodName, duccId, messages.fetchLabel("job state")+jobState+" "+messages.fetchLabel("services state")+serviceState);