BIS-21 cleanup the recovery files

SVN: 25242

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java

@@ -486,12 +486,15 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
 
         // TODO: real cleanup action
 
+        final File recoveryFile = state.getGlobalState().getStorageRecoveryManager().getRecoveryFileFromMarker(recoveryMarkerFile);
+        
         IDelegatedActionWithResult<Boolean> recoveryMarkerFileCleanupAction =
                 new IDelegatedActionWithResult<Boolean>()
                     {
                         public Boolean execute(boolean didOperationSucceed)
                         {
                             recoveryMarkerFile.delete();
+                            recoveryFile.delete();
                             return true;
                         }
                     };

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRecoveryManager.java

@@ -64,13 +64,19 @@ public class DataSetStorageRecoveryManager implements IDataSetStorageRecoveryMan
         return new File(dropboxRecoveryStateDir, incomingFileName + PRECOMMIT_SERIALIZED);
     }
 
+    public File getRecoveryFileFromMarker(File markerFile)
+    {
+        // trim is necessary as it reads the \n at the end of the file
+        String recoveryFilePath = FileUtilities.loadToString(markerFile).trim();
+        return new File(recoveryFilePath);
+    }
+    
     @SuppressWarnings("unchecked")
     public <T extends DataSetInformation> DataSetStoragePrecommitRecoveryState<T> extractPrecommittedCheckpoint(
             File markerFile)
     {
-        // trim is necessary as it reads the \n at the end of the file
-        String recoveryFilePath = FileUtilities.loadToString(markerFile).trim();
-        return FileUtilities.loadToObject(new File(recoveryFilePath),
+        File recoveryFile = getRecoveryFileFromMarker(markerFile);
+        return FileUtilities.loadToObject(recoveryFile,
                 DataSetStoragePrecommitRecoveryState.class);
     }
 

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/IDataSetStorageRecoveryManager.java

@@ -50,9 +50,17 @@ public interface IDataSetStorageRecoveryManager
     <T extends DataSetInformation> DataSetStoragePrecommitRecoveryState<T> extractPrecommittedCheckpoint(
             File markerFile);
 
+    /**
+     * Extracts the recovery file from the marker file
+     */
+    File getRecoveryFileFromMarker(File markerFile);
+    
     // Simple helper methods
     boolean canRecoverFromError(Throwable ex);
 
+    /**
+     * checks whether the file is a proper recovery marker file
+     */
     boolean isRecoveryFile(File file);
 
     void setDropboxRecoveryStateDir(File dropboxRecoveryStateDir);