Skip to content
Snippets Groups Projects
Commit cf469dbc authored by felmer's avatar felmer
Browse files

SSDM-3130: fixing bug (revealed in integration test): Eager shuffling in...

SSDM-3130: fixing bug (revealed in integration test): Eager shuffling in post-registration throws an exception.

SVN: 35684
parent 9c16346f
No related branches found
No related tags found
No related merge requests found
...@@ -212,6 +212,11 @@ public class PathInfoDatabaseFeedingTask implements IMaintenanceTask, IPostRegis ...@@ -212,6 +212,11 @@ public class PathInfoDatabaseFeedingTask implements IMaintenanceTask, IPostRegis
operationLog.info("Feeding finished."); operationLog.info("Feeding finished.");
} }
@Override
public void clearCache()
{
}
private List<SimpleDataSetInformationDTO> filteredDataSets(List<SimpleDataSetInformationDTO> dataSets, Set<String> processedDataSets) private List<SimpleDataSetInformationDTO> filteredDataSets(List<SimpleDataSetInformationDTO> dataSets, Set<String> processedDataSets)
{ {
List<SimpleDataSetInformationDTO> result = new ArrayList<>(); List<SimpleDataSetInformationDTO> result = new ArrayList<>();
......
...@@ -35,4 +35,9 @@ public abstract class AbstractPostRegistrationTask implements IPostRegistrationT ...@@ -35,4 +35,9 @@ public abstract class AbstractPostRegistrationTask implements IPostRegistrationT
this.properties = properties; this.properties = properties;
this.service = service; this.service = service;
} }
@Override
public void clearCache()
{
}
} }
\ No newline at end of file
...@@ -183,6 +183,12 @@ public class EagerShufflingTask extends AbstractPostRegistrationTaskForPhysicalD ...@@ -183,6 +183,12 @@ public class EagerShufflingTask extends AbstractPostRegistrationTaskForPhysicalD
private List<Share> shares; private List<Share> shares;
private Date sharesTimestamp; private Date sharesTimestamp;
@Override
public void clearCache()
{
sharesTimestamp = null;
}
@Override @Override
public IPostRegistrationTaskExecutor createExecutor(String dataSetCode) public IPostRegistrationTaskExecutor createExecutor(String dataSetCode)
{ {
......
...@@ -29,6 +29,11 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService; ...@@ -29,6 +29,11 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
*/ */
public interface IPostRegistrationTask public interface IPostRegistrationTask
{ {
/**
* Clear potential cache.
*/
public void clearCache();
/** /**
* Returns <code>true</code> if this task needs a lock onto the data store. * Returns <code>true</code> if this task needs a lock onto the data store.
*/ */
......
...@@ -185,6 +185,7 @@ public class PostRegistrationMaintenanceTask implements IDataStoreLockingMainten ...@@ -185,6 +185,7 @@ public class PostRegistrationMaintenanceTask implements IDataStoreLockingMainten
for (Entry<String, IPostRegistrationTask> entry : tasks) for (Entry<String, IPostRegistrationTask> entry : tasks)
{ {
IPostRegistrationTask task = entry.getValue(); IPostRegistrationTask task = entry.getValue();
task.clearCache();
String taskName = entry.getKey(); String taskName = entry.getKey();
executor.execute(task, taskName, code, dataSet.isContainer()); executor.execute(task, taskName, code, dataSet.isContainer());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment