From 7f433483ff36d7f506d70981e4c1acb031a3044d Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 1 Mar 2011 09:10:46 +0000
Subject: [PATCH] LMS-2077 improve logging
SVN: 20157
---
.../dss/generic/shared/utils/SegmentedStoreUtils.java | 2 ++
.../dss/generic/shared/utils/SegmentedStoreUtilsTest.java | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
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 7c159d99109..215631717d1 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
@@ -256,6 +256,8 @@ public class SegmentedStoreUtils
logger.log(LogLevel.INFO, "Await for data set " + dataSetCode
+ " to be unlocked.");
shareIdManager.await(dataSetCode);
+ logger.log(LogLevel.INFO, "Start deleting data set " + dataSetCode + " at "
+ + dataSetDirInStore);
FileUtilities.deleteRecursively(dataSetDirInStore);
logger.log(LogLevel.INFO, "Data set " + dataSetCode + " at "
+ dataSetDirInStore + " has been deleted.");
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 31aea1d2f16..32ffaf111cc 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
@@ -222,9 +222,12 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase
assertEquals(true, dataSetDirInStore.exists());
assertFileNames(share2uuid01, "22");
- SegmentedStoreUtils.moveDataSetToAnotherShare(dataSetDirInStore, share2, service, shareIdManager, log);
+ SegmentedStoreUtils.moveDataSetToAnotherShare(dataSetDirInStore, share2, service,
+ shareIdManager, log);
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");
log.assertNextLogMessage("Data set ds-1 at " + share1
+ "/uuid/01/02/03/ds-1 has been deleted.");
assertEquals(false, dataSetDirInStore.exists());
--
GitLab