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/05/22 14:03:51 UTC

svn commit: r1485170 - /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java

Author: degenaro
Date: Wed May 22 12:03:51 2013
New Revision: 1485170

URL: http://svn.apache.org/r1485170
Log:
UIMA-2930 DUCC webserver enhanced to provided easy Admin Job Process cancel facility

Modified:
    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/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=1485170&r1=1485169&r2=1485170&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 May 22 12:03:51 2013
@@ -907,13 +907,19 @@ public class StateManager {
 					+" "+messages.fetchLabel("ip")+nodeId.getIp());
 				if(processMap.containsKey(duccId)) {
 					IDuccProcess process = processMap.get(duccId);
-					process.setResourceState(ResourceState.Deallocated);
-					process.setProcessDeallocationType(ProcessDeallocationType.Forced);
-					logger.info(methodName, duccWorkJob.getDuccId(), messages.fetch("resource deallocated")
-						+" "+messages.fetchLabel("process")+duccId.getFriendly()
-						+" "+messages.fetchLabel("unique")+duccId.getUnique()
-						+" "+messages.fetchLabel("name")+nodeId.getName()
-						+" "+messages.fetchLabel("ip")+nodeId.getIp());
+					switch(process.getResourceState()) {
+					case Deallocated:
+						break;
+					default:
+						process.setResourceState(ResourceState.Deallocated);
+						process.setProcessDeallocationType(ProcessDeallocationType.Forced);
+						logger.info(methodName, duccWorkJob.getDuccId(), messages.fetch("resource deallocated")
+							+" "+messages.fetchLabel("process")+duccId.getFriendly()
+							+" "+messages.fetchLabel("unique")+duccId.getUnique()
+							+" "+messages.fetchLabel("name")+nodeId.getName()
+							+" "+messages.fetchLabel("ip")+nodeId.getIp());
+						break;
+					}
 					/*
 					if(process.isDefunct()) {
 						orchestratorCommonArea.getProcessAccounting().removeProcess(duccId);