From d653a707b8ddf39f9942f663ae515d4a120f2e66 Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Wed, 14 Oct 2015 09:08:33 +0000
Subject: [PATCH] SSDM-2512 - Data Store Server: Allow incoming folder to be on
a different disk than the associated incoming share - revert back to
assigning share even if withdraw-share = true
SVN: 34844
---
.../shared/utils/SegmentedStoreUtils.java | 6 ++--
.../shared/utils/SegmentedStoreUtilsTest.java | 30 ++++---------------
2 files changed, 8 insertions(+), 28 deletions(-)
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 2c66e65e48d..ac65c8d3197 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
@@ -267,14 +267,12 @@ public class SegmentedStoreUtils
new ShareFactory().createShare(share, DUMMY_FREE_SPACE_PROVIDER, logger);
if (shareObject.isWithdrawShare())
{
- logger.log(LogLevel.WARN, "Incoming folder [" + incomingFolder.getName()
+ logger.log(LogLevel.WARN, "Incoming folder [" + incomingFolder.getPath()
+ "] can not be assigned to share " + shareObject.getShareId()
+ " because its property " + ShareFactory.WITHDRAW_SHARE_PROP
+ " is set to true.");
}
- else {
- return share;
- }
+ return share;
}
else {
testFile.delete();
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 ec09518e6df..bb004ef365c 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
@@ -692,34 +692,16 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase
share1.mkdirs();
FileUtilities.writeToFile(new File(share1, "share.properties"),
ShareFactory.WITHDRAW_SHARE_PROP + " = true");
- File share2 = new File(store, "2");
- share2.mkdirs();
- String share = SegmentedStoreUtils.findIncomingShare(incomingFolder, store, null, log);
- assertEquals("2", share);
- }
-
- @Test
- public void testFindIncomingShareFailsWhenWithdrawn()
- {
- File incomingFolder = new File(workingDirectory, "incoming");
- incomingFolder.mkdirs();
- File share1 = new File(store, "1");
- share1.mkdirs();
- FileUtilities.writeToFile(new File(share1, "share.properties"),
- ShareFactory.WITHDRAW_SHARE_PROP + " = true");
+ String share = SegmentedStoreUtils.findIncomingShare(incomingFolder, store, null, log);
- try {
- SegmentedStoreUtils.findIncomingShare(incomingFolder, store, null, log);
- fail("ConfigurationFailureException expected");
- }
- catch(ConfigurationFailureException ex) {
- assertEquals("No share could be found for the following incoming folder: targets/unit-test-wd/"
+ assertEquals("1", share);
+ assertEquals(
+ "WARN: Incoming folder [targets/unit-test-wd/"
+ SegmentedStoreUtilsTest.class.getName()
- + "/incoming", ex.getMessage());
- }
+ + "/incoming] can not be assigned to share 1 because its property "
+ + "withdraw-share is set to true.\n", log.toString());
}
-
@Test
public void testFindIncomingShareToBeIgnoredInShuffling()
{
--
GitLab