BIS-376 SP-574 Add error during prepare phase should also trigger rollback_pre_registration

SVN: 28664

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/v2/ConfiguredOnErrorActionDecision.java

@@ -40,6 +40,8 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
 
     public static final String STORAGE_PROCESSOR_ERROR_KEY = "storage-processor-error";
 
+    public static final String PREPARATION_ERROR_KEY = "preparation-error";
+
     public static final String POST_REGISTRATION_ERROR_KEY = "post-registration-error";
 
     public static final String PRE_REGISTRATION_ERROR_KEY = "pre-registration-error";
@@ -58,6 +60,8 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
 
     private final UnstoreDataAction preRegistrationError;
 
+    private final UnstoreDataAction preparationError;
+
     public ConfiguredOnErrorActionDecision(Properties properties)
     {
         invalidDataSetAction = getAction(ErrorType.INVALID_DATA_SET, properties);
@@ -65,9 +69,10 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
         openbisRegistrationFailure = getAction(ErrorType.OPENBIS_REGISTRATION_FAILURE, properties);
         registrationScriptError = getAction(ErrorType.REGISTRATION_SCRIPT_ERROR, properties);
         storageProcessorError = getAction(ErrorType.STORAGE_PROCESSOR_ERROR, properties);
+        preparationError = getAction(ErrorType.PREPARATION_ERROR, properties);
         postRegistrationError = getAction(ErrorType.POST_REGISTRATION_ERROR, properties);
         preRegistrationError = getAction(ErrorType.PRE_REGISTRATION_ERROR, properties);
-           }
+    }
 
     @Override
     public UnstoreDataAction computeUndoAction(ErrorType errorType, Throwable failureOrNull)
@@ -87,6 +92,9 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
             case STORAGE_PROCESSOR_ERROR:
                 action = storageProcessorError;
                 break;
+            case PREPARATION_ERROR:
+                action = preparationError;
+                break;
             case VALIDATION_SCRIPT_ERROR:
                 action = validationScriptError;
                 break;
@@ -127,6 +135,9 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
             case PRE_REGISTRATION_ERROR:
                 actionStringKey = PRE_REGISTRATION_ERROR_KEY;
                 break;
+            case PREPARATION_ERROR:
+                actionStringKey = PREPARATION_ERROR_KEY;
+                break;
         }
 
         String actionString = PropertyUtils.getProperty(properties, actionStringKey);
@@ -159,7 +170,8 @@ public class ConfiguredOnErrorActionDecision implements IDataSetOnErrorActionDec
             case VALIDATION_SCRIPT_ERROR:
             case POST_REGISTRATION_ERROR:
             case PRE_REGISTRATION_ERROR:
-                    action = UnstoreDataAction.LEAVE_UNTOUCHED;
+            case PREPARATION_ERROR:
+                action = UnstoreDataAction.LEAVE_UNTOUCHED;
                 break;
         }
 

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageAlgorithmRunner.java

@@ -180,7 +180,23 @@ public class DataSetStorageAlgorithmRunner<T extends DataSetInformation>
     /**
      * Prepare registration of a data set.
      */
-    public final void prepare()
+    public final boolean safePrepare()
+    {
+        try
+        {
+            prepare();
+        } catch (final Throwable throwable)
+        {
+            rollbackDuringPreparation(throwable);
+            return false;
+        }
+
+        dssRegistrationLog.log("Preparation ready");
+
+        return true;
+    }
+
+    private final void prepare()
     {
         // Log information about the prepare
         StringBuilder registrationSummary = new StringBuilder();
@@ -300,7 +316,10 @@ public class DataSetStorageAlgorithmRunner<T extends DataSetInformation>
      */
     public boolean prepareAndRunStorageAlgorithms()
     {
-        prepare();
+        if (safePrepare() == false)
+        {
+            return false;
+        }
         // all algorithms are now in
         // PREPARED STATE
 
@@ -445,6 +464,13 @@ public class DataSetStorageAlgorithmRunner<T extends DataSetInformation>
                 ErrorType.STORAGE_PROCESSOR_ERROR);
     }
 
+    private void rollbackDuringPreparation(Throwable ex)
+    {
+        operationLog.error("Failed to prepare");
+        rollbackStorageProcessors(ex);
+        rollbackDelegate.didRollbackStorageAlgorithmRunner(this, ex, ErrorType.PREPARATION_ERROR);
+    }
+
     private void rollbackDuringPreRegistration(Throwable ex)
     {
         operationLog.error("Failed to pre-register", ex);

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IDataSetOnErrorActionDecision.java

@@ -29,7 +29,7 @@ public interface IDataSetOnErrorActionDecision
     {
         INVALID_DATA_SET, VALIDATION_SCRIPT_ERROR, REGISTRATION_SCRIPT_ERROR,
         PRE_REGISTRATION_ERROR, OPENBIS_REGISTRATION_FAILURE, STORAGE_PROCESSOR_ERROR,
-        POST_REGISTRATION_ERROR;
+        PREPARATION_ERROR, POST_REGISTRATION_ERROR;
     }
 
     UnstoreDataAction computeUndoAction(ErrorType errorType, Throwable failureOrNull);

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java

@@ -254,6 +254,7 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
                             ConfiguredOnErrorActionDecision.POST_REGISTRATION_ERROR_KEY,
                             ConfiguredOnErrorActionDecision.REGISTRATION_SCRIPT_ERROR_KEY,
                             ConfiguredOnErrorActionDecision.STORAGE_PROCESSOR_ERROR_KEY,
+                            ConfiguredOnErrorActionDecision.PREPARATION_ERROR_KEY,
                             ConfiguredOnErrorActionDecision.VALIDATION_SCRIPT_ERROR_KEY, };
 
         // simple test failing registration testCase