BIS-506 / SP-830: ZipArchiver should create notification if archiving fails

SVN: 29671

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java

@@ -236,7 +236,7 @@ public abstract class AbstractArchiverProcessingPlugin extends AbstractDatastore
 
         return new GroupedDatasets(upToDateInArchive, differentInArchive);
     }
-    
+
     private List<DatasetDescription> getDataSetsFailedToBeArchived(
             List<DatasetDescription> datasets, DatasetProcessingStatuses statuses)
     {
@@ -336,7 +336,7 @@ public abstract class AbstractArchiverProcessingPlugin extends AbstractDatastore
         DatasetProcessingStatuses status = doDeleteFromArchive(datasets);
         return status != null ? status.getProcessingStatus() : null;
     }
-    
+
     protected DatasetProcessingStatuses deletePermanentlyFromArchive(List<? extends IDatasetLocation> dataSets)
     {
         return doDeleteFromArchive(dataSets);
@@ -417,7 +417,7 @@ public abstract class AbstractArchiverProcessingPlugin extends AbstractDatastore
             String logMessage = createLogMessage(datasetCode, status, operationDescription);
             if (status.isError())
             {
-                operationLog.error(logMessage);
+                notifyLog.error(logMessage);
                 failedDatasetCodes.add(datasetCode);
             } else
             {
@@ -554,12 +554,12 @@ public abstract class AbstractArchiverProcessingPlugin extends AbstractDatastore
     {
         this.statusUpdater = statusUpdater;
     }
-    
+
     protected void setShareIdManager(IShareIdManager shareIdManager)
     {
         this.shareIdManager = shareIdManager;
     }
-    
+
     protected void setService(IEncapsulatedOpenBISService service)
     {
         this.service = service;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDatastorePlugin.java

@@ -40,6 +40,9 @@ public abstract class AbstractDatastorePlugin implements Serializable
     static protected final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
             AbstractDatastorePlugin.class);
 
+    static protected final Logger notifyLog = LogFactory.getLogger(LogCategory.NOTIFY,
+            AbstractDatastorePlugin.class);
+
     private static final String SUB_DIRECTORY_NAME = "sub-directory-name";
 
     private static final long serialVersionUID = 1L;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DistributedPackagingDataSetFileOperationsManager.java

@@ -169,13 +169,18 @@ public class DistributedPackagingDataSetFileOperationsManager implements IDataSe
                 {
                     dataSetPackager.close();
 
-                    List<String> errors =
-                            verify(file, new ZipFileIntegrityVerifier());
-
-                    if (errors.size() > 0)
+                    if (Status.OK.equals(status))
                     {
-                        throw new RuntimeException(errors.toString());
+                        List<String> errors =
+                                verify(file, new ZipFileIntegrityVerifier());
+
+                        if (errors.size() > 0)
+                        {
+                            status = Status.createError(errors.toString());
+                            throw new RuntimeException(errors.toString());
+                        }
                     }
+
                     operationLog.info("Data set '" + dataSetCode + "' archived: " + file);
                 } catch (Exception ex)
                 {