From db1a50ae9334c0885cd138e2fa44258dce16968b Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 26 Jun 2013 09:07:26 +0000
Subject: [PATCH] SP-723, BIS-460: Log that verification of data sets moved to
another share started.
SVN: 29467
---
.../openbis/dss/generic/shared/utils/SegmentedStoreUtils.java | 2 ++
.../dss/generic/shared/utils/SegmentedStoreUtilsTest.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
index 3d024c735fc..58ad240b680 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
@@ -283,6 +283,8 @@ public class SegmentedStoreUtils
File dataSetDirInNewShare = new File(share, relativePath);
dataSetDirInNewShare.mkdirs();
copyToShare(dataSetDirInStore, dataSetDirInNewShare, logger);
+ logger.log(LogLevel.INFO, "Verifying structure, size and optional checksum of "
+ + "data set content in share " + share.getName() + ".");
long size =
assertEqualSizeAndChildren(dataSetCode, dataSetDirInStore, dataSetDirInStore,
dataSetDirInNewShare, dataSetDirInNewShare, checksumProvider);
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
index 5eb12893cb9..d6ec4854e5d 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
@@ -292,6 +292,7 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase
+ "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."
+ "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("Start deleting data set ds-1 at " + share1
+ "/uuid/01/02/03/ds-1");
@@ -356,6 +357,7 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase
+ "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."
+ "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("Start deleting data set ds-1 at " + share1
+ "/uuid/01/02/03/ds-1");
--
GitLab