From ec5b3fdbb280e1f9f3e3582e0ec63fdd7a05a179 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 25 May 2016 07:07:53 +0000
Subject: [PATCH] SSDM-3574: ServiceForDataStoreServerLogger: log message
improved. DataSetCommandExecutor: remove unused code.
ResetArchivePendingTask: reset only data sets which are not present in
archive.
SVN: 36573
---
.../plugins/ResetArchivePendingTask.java | 3 ++-
.../server/DataSetCommandExecutor.java | 19 -------------------
.../ServiceForDataStoreServerLogger.java | 2 +-
3 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java
index 08a5f47e778..1b0d7bd0fc0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java
@@ -73,7 +73,8 @@ public class ResetArchivePendingTask implements IMaintenanceTask
List<SimpleDataSetInformationDTO> dataSetsToUpdate = new ArrayList<SimpleDataSetInformationDTO>();
for (SimpleDataSetInformationDTO inArchivePending : inArchivePendings)
{
- if (!inQueue.contains(inArchivePending.getDataSetCode()))
+ if (inQueue.contains(inArchivePending.getDataSetCode()) == false
+ && inArchivePending.isPresentInArchive() == false)
{
dataSetsToUpdate.add(inArchivePending);
operationLog.info(inArchivePending.getDataSetCode() + " not found in command queue, scheduled to update.");
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java
index d62a2a1f383..86e85312730 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java
@@ -225,25 +225,6 @@ class DataSetCommandExecutor implements IDataSetCommandExecutor
return dataSetCodes;
}
- /**
- * Returns the list of items in the command store of the given <var>store</var> directory.
- */
- public static List<IDataSetCommand> getQueuedCommands(File store)
- {
- List<IDataSetCommand> commands = new ArrayList<IDataSetCommand>();
- List<File> commandQueueFiles = listCommandQueueFiles(store);
- for (File queueFile : commandQueueFiles)
- {
- final IExtendedBlockingQueue<IDataSetCommand> commandQueue =
- PersistentExtendedBlockingQueueFactory.<IDataSetCommand> createSmartPersist(queueFile);
- for (final IDataSetCommand cmd : commandQueue)
- {
- commands.add(cmd);
- }
- }
- return commands;
- }
-
/**
* Writes the list of items in the command store of the given <var>store</var> directory to stdout.
*/
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java
index e120217c32e..7971e882614 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java
@@ -422,7 +422,7 @@ public class ServiceForDataStoreServerLogger extends AbstractServerLogger implem
public List<SimpleDataSetInformationDTO> listPhysicalDataSetsByArchivingStatus(String sessionToken, String dataStoreCode,
DataSetArchivingStatus archivingStatus) throws UserFailureException
{
- logAccess(sessionToken, "listPhysicalDataSetsByArchivingStatus", "DATA_STORE(%s)", dataStoreCode);
+ logAccess(sessionToken, "listPhysicalDataSetsByArchivingStatus", "DATA_STORE(%s) STATUS(%s)", dataStoreCode, archivingStatus);
return null;
}
--
GitLab