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/19 19:13:40 UTC

svn commit: r1765701 - /uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java

Author: degenaro
Date: Wed Oct 19 19:13:40 2016
New Revision: 1765701

URL: http://svn.apache.org/viewvc?rev=1765701&view=rev
Log:
UIMA-5060 DUCC Orchestrator (OR) "warm" restart issues

- remove sequenceNumberStateAbbreviated from orchestrator-state.json, since it is obsolete

Modified:
    uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java

Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java?rev=1765701&r1=1765700&r2=1765701&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java Wed Oct 19 19:13:40 2016
@@ -44,7 +44,6 @@ public class OrchestratorState {
 	private static DuccId jobid = null;
 	
 	private long sequenceNumberState = -1;
-	private long sequenceNumberStateAbbreviated = -1;
 	
 	public static OrchestratorState getInstance() {
 		String location = "getInstance";
@@ -83,30 +82,10 @@ public class OrchestratorState {
 		}
 	}
 	
-	public long getNextSequenceNumberStateAbbreviated() {
-		String location = "getNextSequenceNumberStateAbbreviated";
-		synchronized(this) {
-			sequenceNumberStateAbbreviated++;
-			exportState();
-			logger.debug(location, jobid, ""+sequenceNumberStateAbbreviated);
-			return sequenceNumberStateAbbreviated;
-		}
-	}
-	
-	public void setNextSequenceNumberStateAbbreviated(long value) {
-		String location = "setNextSequenceNumberStateAbbreviated";
-		synchronized(this) {
-			sequenceNumberStateAbbreviated = value;
-			exportState();
-			logger.debug(location, jobid, ""+sequenceNumberStateAbbreviated);
-		}
-	}
-	
 	private void copy(OrchestratorState importedState) {
 		String location = "copy";
 		if(importedState != null) {
 			setNextSequenceNumberState(importedState.getNextSequenceNumberState());
-			setNextSequenceNumberStateAbbreviated(importedState.getNextSequenceNumberStateAbbreviated());
 		}
 		else {
 			logger.warn(location, jobid, "no previous state found");