- add logging when deletion of staging dir/marker file fails.

- log an error when the rollback of a MkdirsCommand and NewFileCommand fails to delete the underlying file

SVN: 23407

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

@@ -538,6 +538,10 @@ public class DataSetStorageAlgorithm<T extends DataSetInformation>
         private void cleanUpMarkerFile()
         {
             getFileOperations().delete(markerFile);
+            if (markerFile.exists())
+            {
+                operationLog.error("Marker file '" + markerFile + "' could not be deleted.");
+            }
         }
     }
 
@@ -557,6 +561,11 @@ public class DataSetStorageAlgorithm<T extends DataSetInformation>
         private void cleanUpStagingDirectory()
         {
             getFileOperations().delete(stagingDirectory);
+            if (stagingDirectory.exists())
+            {
+                operationLog.error("Staging directory '" + stagingDirectory
+                        + "' could not be deleted.");
+            }
         }
 
     }

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MkdirsCommand.java

@@ -18,8 +18,12 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
 
+import org.apache.log4j.Logger;
+
 import ch.systemsx.cisd.common.filesystem.FileOperations;
 import ch.systemsx.cisd.common.filesystem.IFileOperations;
+import ch.systemsx.cisd.common.logging.LogCategory;
+import ch.systemsx.cisd.common.logging.LogFactory;
 
 /**
  * Creates a directory and all necessary intermediate dirctories.
@@ -30,6 +34,9 @@ public class MkdirsCommand extends AbstractTransactionalCommand
 {
     private static final long serialVersionUID = 1L;
 
+    private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
+            MkdirsCommand.class);
+
     private final String directoryAbsoutePath;
 
     public MkdirsCommand(String directoryAbsoutePath)
@@ -58,6 +65,10 @@ public class MkdirsCommand extends AbstractTransactionalCommand
 
         IFileOperations fileOperations = FileOperations.getMonitoredInstanceForCurrentThread();
         fileOperations.delete(src);
+        if (src.exists())
+        {
+            operationLog.error("Could not delete directory '" + src + "'.");
+        }
     }
 
     @Override

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/NewFileCommand.java

@@ -18,8 +18,12 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
 
+import org.apache.log4j.Logger;
+
 import ch.systemsx.cisd.common.filesystem.FileOperations;
 import ch.systemsx.cisd.common.filesystem.IFileOperations;
+import ch.systemsx.cisd.common.logging.LogCategory;
+import ch.systemsx.cisd.common.logging.LogFactory;
 
 /**
  * Creates a directory and all necessary intermediate dirctories.
@@ -30,6 +34,9 @@ public class NewFileCommand extends AbstractTransactionalCommand
 {
     private static final long serialVersionUID = 1L;
 
+    private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
+            NewFileCommand.class);
+
     private final String fileAbsolutePath;
 
     public NewFileCommand(String directoryAbsoutePath)
@@ -58,6 +65,11 @@ public class NewFileCommand extends AbstractTransactionalCommand
 
         IFileOperations fileOperations = FileOperations.getMonitoredInstanceForCurrentThread();
         fileOperations.delete(src);
+        if (src.exists())
+        {
+            operationLog.error("Could not delete file '" + src + "'.");
+        }
+
     }
 
     @Override