From d6a50e8aeb56f413e2d488487803351be226304b Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Tue, 11 Sep 2007 16:58:21 +0000
Subject: [PATCH] fix: make tryLocalMove() failures retry since we have seen
local move attempts to fail
SVN: 1689
---
.../datamover/filesystem/LocalFileSystem.java | 26 +++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/LocalFileSystem.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/LocalFileSystem.java
index 506dde8f212..42d9c943268 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/LocalFileSystem.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/LocalFileSystem.java
@@ -41,6 +41,11 @@ public class LocalFileSystem
private static final Logger notificationLog = LogFactory.getLogger(LogCategory.NOTIFY, LocalFileSystem.class);
+ // TODO 2007-09-11, Bernd Rinn: make this configurable
+
+ private static final int MAX_RETRIES_ON_FAILURE = 12;
+ private static final long MILLIS_TO_SLEEP_ON_FAILURE = 5000;
+
/**
* Lists all resources in a given directory, logs errors.
*/
@@ -86,10 +91,27 @@ public class LocalFileSystem
operationLog.info(String.format("Moving path '%s' to '%s'", sourcePath.getPath(), destinationPath));
}
File destFile = new File(destinationPath);
- boolean movedOK = sourcePath.renameTo(destFile);
+ int failures = 0;
+ boolean movedOK = false;
+ do {
+ movedOK = sourcePath.renameTo(destFile);
+ if (movedOK == false)
+ {
+ ++failures;
+ operationLog.warn(String.format("Moving path '%s' to directory '%s' failed (attempt %d).", sourcePath,
+ destinationDirectory, failures + 1));
+ try
+ {
+ Thread.sleep(MILLIS_TO_SLEEP_ON_FAILURE);
+ } catch (InterruptedException ex)
+ {
+ break;
+ }
+ }
+ } while (failures < MAX_RETRIES_ON_FAILURE);
if (movedOK == false)
{
- notificationLog.error(String.format("Moving path '%s' to directory '%s' failed.", sourcePath,
+ notificationLog.error(String.format("Moving path '%s' to directory '%s' failed, giving up.", sourcePath,
destinationDirectory));
return null;
} else
--
GitLab