SSDM-3617 : Maintenance task to find orphan datasets in archivers, bugfixes

SVN: 36650

datastore_server/resource/dependency-structure.ddf

@@ -23,7 +23,7 @@ check [dss] [etlserver] independentOf [private_openbis]
 # Check dependencies of etlserver to dss
 
 [dss.shared] = ${dss}.generic.shared.*
-[private_dss] = ${dss}.* excluding [dss.shared] ${dss}.generic.server.IDataSetCommandExecutorProvider ${dss}.generic.server.IDataSetCommandExecutor ${dss}.BuildAndEnvironmentInfo ${dss}.generic.DataStoreServer ${dss}.generic.server.DataStoreServer ${dss}.generic.server.api.v1.DssServiceRpcGeneric ch.systemsx.cisd.openbis.dss.generic.server.DataStoreService ${dss}.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverDataSourceUtil
+[private_dss] = ${dss}.* excluding [dss.shared] ${dss}.generic.server.IDataSetCommandExecutorProvider ${dss}.generic.server.IDataSetCommandExecutor ${dss}.BuildAndEnvironmentInfo ${dss}.generic.DataStoreServer ${dss}.generic.server.DataStoreServer ${dss}.generic.server.api.v1.DssServiceRpcGeneric ch.systemsx.cisd.openbis.dss.generic.server.DataStoreService ${dss}.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverDataSourceUtil ${dss}.generic.server.plugins.standard.archiver.MultiDataSetArchiver
 
 [etlserver_registration] = ${etlserver}.registrator.* ${etlserver}.postregistration.* ${etlserver}.DssUniqueFilenameGenerator \
       ${etlserver}.Parameters ${etlserver}.ITopLevelDataSetRegistratorDelegate \

datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetArchiverOrphanFinderTask.java

@@ -18,6 +18,7 @@ import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.maintenance.IMaintenanceTask;
 import ch.systemsx.cisd.common.properties.PropertyUtils;
 import ch.systemsx.cisd.openbis.dss.generic.server.DataStoreServer;
+import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDataSetArchiver;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverDataSourceUtil;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
 import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
@@ -36,15 +37,18 @@ public class DataSetArchiverOrphanFinderTask implements IMaintenanceTask
 
     private IMailClient mailClient;
 
+    private boolean isMultiDatasetArchiver;
+
     public DataSetArchiverOrphanFinderTask()
     {
-        this(ServiceProvider.getDataStoreService().createEMailClient());
+        this(ServiceProvider.getDataStoreService().createEMailClient(),
+                ServiceProvider.getDataStoreService().getArchiverPlugin() instanceof MultiDataSetArchiver);
     }
 
-    DataSetArchiverOrphanFinderTask(IMailClient mailClient)
+    DataSetArchiverOrphanFinderTask(IMailClient mailClient, boolean isMultiDatasetArchiver)
     {
         this.mailClient = mailClient;
-
+        this.isMultiDatasetArchiver = isMultiDatasetArchiver;
     }
 
     @Override
@@ -61,8 +65,12 @@ public class DataSetArchiverOrphanFinderTask implements IMaintenanceTask
         operationLog.info(DataSetArchiverOrphanFinderTask.class.getSimpleName() + " Started");
 
         operationLog.info("1. Directories, obtain archiver directory.");
-        String destination = DataStoreServer.getConfigParameter("archiver.final-destination", null);
-        if (destination == null)
+
+        String destination = null;
+        if (isMultiDatasetArchiver)
+        {
+            destination = DataStoreServer.getConfigParameter("archiver.final-destination", null);
+        } else
         {
             destination = DataStoreServer.getConfigParameter("archiver.destination", null);
         }
@@ -74,12 +82,16 @@ public class DataSetArchiverOrphanFinderTask implements IMaintenanceTask
         }
 
         operationLog.info("2.1 Database, obtain a list of the multi dataset containers on the database.");
-        List<String> containers = MultiDataSetArchiverDataSourceUtil.getContainerList();
+        List<String> multiDataSetContrainers = null;
+        if (isMultiDatasetArchiver)
+        {
+            multiDataSetContrainers = MultiDataSetArchiverDataSourceUtil.getContainerList();
+        }
 
         Set<String> multiDatasetsContainersOnDB = new HashSet<String>();
-        if (containers != null)
+        if (multiDataSetContrainers != null)
         {
-            for (String container : containers)
+            for (String container : multiDataSetContrainers)
             {
                 multiDatasetsContainersOnDB.add(container.toLowerCase());
             }
@@ -144,7 +156,9 @@ public class DataSetArchiverOrphanFinderTask implements IMaintenanceTask
 
             if (presentInArchiveFS.contains(fileNameTar) == false &&
                     presentInArchiveFS.contains(fileNameZip) == false &&
-                    MultiDataSetArchiverDataSourceUtil.isDataSetInContainer(presentOnDB.toUpperCase()) == false)
+                    (isMultiDatasetArchiver == false ||
+                            (isMultiDatasetArchiver &&
+                                    MultiDataSetArchiverDataSourceUtil.isDataSetInContainer(presentOnDB.toUpperCase()) == false)))
             {
                 operationLog.debug("Single - Not found in FS for DB: " + presentOnDB);
                 singleOnDBandNotFS.add(presentOnDB);

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSourceUtil.java

@@ -21,11 +21,6 @@ import java.util.List;
 
 import javax.sql.DataSource;
 
-import org.apache.log4j.Logger;
-
-import ch.systemsx.cisd.common.logging.LogCategory;
-import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.etlserver.plugins.DataSetArchiverOrphanFinderTask;
 import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
 import net.lemnik.eodsql.QueryTool;
 
@@ -34,8 +29,6 @@ import net.lemnik.eodsql.QueryTool;
  */
 public class MultiDataSetArchiverDataSourceUtil
 {
-    private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION, DataSetArchiverOrphanFinderTask.class);
-
     private static DataSource dataSource = ServiceProvider.getDataSourceProvider().getDataSource("multi-dataset-archiver-db");
 
     static IMultiDataSetArchiverQueryDAO getTransactionalQuery()
@@ -50,15 +43,7 @@ public class MultiDataSetArchiverDataSourceUtil
 
     public static List<String> getContainerList()
     {
-        List<MultiDataSetArchiverContainerDTO> containerDTOs = null;
-        try
-        {
-            containerDTOs = getReadonlyQueryDAO().listContainers();
-        } catch (Exception ex)
-        {
-            operationLog.debug("Multi data set archiver unavailable");
-        }
-
+        List<MultiDataSetArchiverContainerDTO> containerDTOs = getReadonlyQueryDAO().listContainers();
         List<String> containers = new ArrayList<String>();
         if (containerDTOs != null)
         {
@@ -72,14 +57,7 @@ public class MultiDataSetArchiverDataSourceUtil
 
     public static Boolean isDataSetInContainer(String dataSetCode)
     {
-        MultiDataSetArchiverDataSetDTO dataSetDTO = null;
-        try
-        {
-            dataSetDTO = getReadonlyQueryDAO().getDataSetForCode(dataSetCode);
-        } catch (Exception ex)
-        {
-            operationLog.debug("Multi data set archiver unavailable");
-        }
+        MultiDataSetArchiverDataSetDTO dataSetDTO = getReadonlyQueryDAO().getDataSetForCode(dataSetCode);
         return dataSetDTO != null && dataSetDTO.getContainerId() > 0;
     }