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

SP-723, BIS-460: Log that verification of data sets moved to another share started.

SVN: 29467
parent 9f2bfe34
No related branches found
No related tags found
No related merge requests found
...@@ -283,6 +283,8 @@ public class SegmentedStoreUtils ...@@ -283,6 +283,8 @@ public class SegmentedStoreUtils
File dataSetDirInNewShare = new File(share, relativePath); File dataSetDirInNewShare = new File(share, relativePath);
dataSetDirInNewShare.mkdirs(); dataSetDirInNewShare.mkdirs();
copyToShare(dataSetDirInStore, dataSetDirInNewShare, logger); copyToShare(dataSetDirInStore, dataSetDirInNewShare, logger);
logger.log(LogLevel.INFO, "Verifying structure, size and optional checksum of "
+ "data set content in share " + share.getName() + ".");
long size = long size =
assertEqualSizeAndChildren(dataSetCode, dataSetDirInStore, dataSetDirInStore, assertEqualSizeAndChildren(dataSetCode, dataSetDirInStore, dataSetDirInStore,
dataSetDirInNewShare, dataSetDirInNewShare, checksumProvider); dataSetDirInNewShare, dataSetDirInNewShare, checksumProvider);
......
...@@ -292,6 +292,7 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase ...@@ -292,6 +292,7 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase
+ "openbis.dss.generic.shared.utils.SegmentedStoreUtilsTest/store/1/uuid/01/02/03/ds-1'" + "openbis.dss.generic.shared.utils.SegmentedStoreUtilsTest/store/1/uuid/01/02/03/ds-1'"
+ " to new share 'targets/unit-test-wd/ch.systemsx.cisd.openbis.dss.generic.shared.utils." + " to new share 'targets/unit-test-wd/ch.systemsx.cisd.openbis.dss.generic.shared.utils."
+ "SegmentedStoreUtilsTest/store/2/uuid/01/02/03/ds-1'"); + "SegmentedStoreUtilsTest/store/2/uuid/01/02/03/ds-1'");
log.assertNextLogMessage("Verifying structure, size and optional checksum of data set content in share 2.");
log.assertNextLogMessage("Await for data set ds-1 to be unlocked."); log.assertNextLogMessage("Await for data set ds-1 to be unlocked.");
log.assertNextLogMessage("Start deleting data set ds-1 at " + share1 log.assertNextLogMessage("Start deleting data set ds-1 at " + share1
+ "/uuid/01/02/03/ds-1"); + "/uuid/01/02/03/ds-1");
...@@ -356,6 +357,7 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase ...@@ -356,6 +357,7 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase
+ "openbis.dss.generic.shared.utils.SegmentedStoreUtilsTest/store/1/uuid/01/02/03/ds-1'" + "openbis.dss.generic.shared.utils.SegmentedStoreUtilsTest/store/1/uuid/01/02/03/ds-1'"
+ " to new share 'targets/unit-test-wd/ch.systemsx.cisd.openbis.dss.generic.shared.utils." + " to new share 'targets/unit-test-wd/ch.systemsx.cisd.openbis.dss.generic.shared.utils."
+ "SegmentedStoreUtilsTest/store/2/uuid/01/02/03/ds-1'"); + "SegmentedStoreUtilsTest/store/2/uuid/01/02/03/ds-1'");
log.assertNextLogMessage("Verifying structure, size and optional checksum of data set content in share 2.");
log.assertNextLogMessage("Await for data set ds-1 to be unlocked."); log.assertNextLogMessage("Await for data set ds-1 to be unlocked.");
log.assertNextLogMessage("Start deleting data set ds-1 at " + share1 log.assertNextLogMessage("Start deleting data set ds-1 at " + share1
+ "/uuid/01/02/03/ds-1"); + "/uuid/01/02/03/ds-1");
......
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