From 41682375bfe4ec332bd616f36e5656992e83712c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 18 Aug 2015 08:15:34 +0000
Subject: [PATCH] SSDM-2329 EagerShufflingTask: Improved log message.
SVN: 34481
---
.../postregistration/EagerShufflingTask.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java
index 4ddb01d21bc..be70e756b0e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java
@@ -223,10 +223,14 @@ public class EagerShufflingTask extends AbstractPostRegistrationTaskForPhysicalD
{
if (shareWithMostFreeOrNull != null)
{
+ String shareId = shareWithMostFreeOrNull.getShareId();
try
{
- if(service.isDataSetOnTrashCanOrDeleted(dataSetCode)) {
- logger.log(LogLevel.INFO, "Data set " + dataSetCode + " will not be moved from share because is on the trashcan or deleted.");
+ if (service.isDataSetOnTrashCanOrDeleted(dataSetCode))
+ {
+ logger.log(LogLevel.WARN, "Data set " + dataSetCode + " will not be moved from share "
+ + dataSet.getDataSetShareId() + " to " + shareId
+ + " because it is in the trash can or has been deleted.");
} else {
long freeSpaceBefore = shareWithMostFreeOrNull.calculateFreeSpace();
File share = new File(storeRoot, shareIdManager.getShareId(dataSetCode));
@@ -235,7 +239,6 @@ public class EagerShufflingTask extends AbstractPostRegistrationTaskForPhysicalD
new File(share, dataSet.getDataSetLocation()),
shareWithMostFreeOrNull.getShare(), getChecksumProvider(), logger);
- String shareId = shareWithMostFreeOrNull.getShareId();
logger.log(LogLevel.INFO, "Data set " + dataSetCode
+ " successfully moved from share " + dataSet.getDataSetShareId()
+ " to " + shareId + ".");
@@ -254,7 +257,7 @@ public class EagerShufflingTask extends AbstractPostRegistrationTaskForPhysicalD
} catch (Throwable t)
{
logger.log(LogLevel.ERROR, "Couldn't move data set " + dataSetCode
- + " to share " + shareWithMostFreeOrNull.getShareId() + ".", t);
+ + " to share " + shareId + ".", t);
}
}
}
--
GitLab