svn commit: r1480453 - /uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java

[challngr]

Author: challngr
Date: Wed May  8 20:54:42 2013
New Revision: 1480453

URL: http://svn.apache.org/r1480453
Log:
UIMA-2789
Back out persistence of RM share ids.

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java?rev=1480453&r1=1480452&r2=1480453&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
 Wed May  8 20:54:42 2013
@@ -19,10 +19,7 @@
 package org.apache.uima.ducc.rm.scheduler;
 
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -112,11 +109,6 @@ public class Scheduler
     int nodeStability = 3;
     boolean stability = false;
 
-    // all the stuff needed to manage persistent monotonically-increasing 
"friendly" ids
-    private String state_dir = null;
-    private static String rm_seqno = "rm.seqno";
-    private static String state_file = null;
-    private static DuccProperties rm_state = null;
     private static DuccIdFactory idFactory;
 
     // static boolean expandByDoubling = true;
@@ -173,23 +165,7 @@ public class Scheduler
             dramOverride = dramOverride * (1024 * 1024);         // convert to 
KB
         }
 
-        state_dir = System.getProperty("DUCC_HOME") + "/state";
-        state_file = state_dir + "/rm.properties";
-        rm_state = new DuccProperties();
-        File sf = new File(state_file);
-        int seq = 0;
-        FileInputStream fos;
-        if ( sf.exists() ) {
-            fos = new FileInputStream(state_file);
-            try {
-                rm_state.load(fos);
-                String s = rm_state.getProperty(rm_seqno);
-                seq = Integer.parseInt(s) + 1;
-            } finally {
-                fos.close();
-            }
-        } 
-        idFactory = new DuccIdFactory(seq);
+        idFactory = new DuccIdFactory(1);
 
         try {
             schedImplName = 
SystemPropertyResolver.getStringProperty("ducc.rm.scheduler", 
"org.apache.uima.ducc.rm.rm.ClassBasedScheduler");
@@ -1157,19 +1133,7 @@ public class Scheduler
 
     public synchronized static DuccId newId()
     {
-       String methodName = "newId";
         DuccId id = idFactory.next();
-        try {
-            rm_state.setProperty(rm_seqno, id.toString());
-            FileOutputStream fos = new FileOutputStream(state_file);
-            rm_state.store(fos, "Resource Manager Properties");
-            fos.close();
-        } catch ( Exception e ) {
-            logger.error(methodName, null, "CANNOT ALLOCATE NEW DUCC ID");
-            logger.error(methodName, null, "CANNOT ALLOCATE NEW DUCC ID");
-            logger.error(methodName, null, "CANNOT ALLOCATE NEW DUCC ID 
BECAUSE OF", e);
-            System.exit(1);
-        }
         return id;
     }