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 2016/10/20 14:35:59 UTC
svn commit: r1765821 -
/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Author: degenaro
Date: Thu Oct 20 14:35:59 2016
New Revision: 1765821
URL: http://svn.apache.org/viewvc?rev=1765821&view=rev
Log:
UIMA-5060 DUCC Orchestrator (OR) "warm" restart issues
- remove JD share from reservation as soon as it is deallocated and Agent reports process is not running
Modified:
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1765821&r1=1765820&r2=1765821&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java Thu Oct 20 14:35:59 2016
@@ -283,6 +283,9 @@ public class StateManager {
case Service:
DuccWorkJob duccWorkJob = (DuccWorkJob)duccWork;
if(duccWorkJob != null) {
+ if(jobDriverTerminated(duccWorkJob)) {
+ OrchestratorHelper.jdDeallocate(duccWorkJob);
+ }
if(duccWorkJob.isCompleting() && allProcessesTerminated(duccWorkJob)) {
stateJobAccounting.stateChange(duccWorkJob, JobState.Completed);
}
@@ -1510,6 +1513,9 @@ public class StateManager {
switch(processType) {
case Pop:
OrchestratorCommonArea.getInstance().getProcessAccounting().setStatus(inventoryProcess);
+ if(jobDriverTerminated(job)) {
+ OrchestratorHelper.jdDeallocate(job);
+ }
switch(inventoryProcess.getProcessState()) {
case LaunchFailed:
case Failed: