motiejus
/
jgit
1
Fork 0
Code Releases Activity

FileUtils.rename(): better retry handling 

When the atomic move fails on Windows, it may be because some other
thread is currently reading the destination. If we delete the file
then, that reader may get an exception, and conclude the file didn't
exist, even though the rename() would re-create it right away.

Try to avoid this from happening frequently by only deleting the
destination on the last retry. Also don't sleep after the last attempt.

Bug: 451508
Change-Id: I95bb4ec59d6e7efb4a7fc8d67f5df301f690257a
Signed-off-by: Thomas Wolf <twolf@apache.org>
This commit is contained in:
Thomas Wolf 2023-10-08 22:03:22 +02:00
parent cb46ee3544
commit f6774fa8ee
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java
View File

@ -295,6 +295,7 @@ public static void rename(final File src, final File dst,
CopyOption... options)
throws AtomicMoveNotSupportedException, IOException {
int attempts = FS.DETECTED.retryFailedLockFileCommit() ? 10 : 1;
IOException finalError = null;
while (--attempts >= 0) {
try {
Files.move(toPath(src), toPath(dst), options);
@ -302,29 +303,35 @@ public static void rename(final File src, final File dst,
} catch (AtomicMoveNotSupportedException e) {
throw e;
} catch (IOException e) {
try {
if (!dst.delete()) {
delete(dst, EMPTY_DIRECTORIES_ONLY | RECURSIVE);
if (attempts == 0) {
// Only delete on the last attempt.
try {
if (!dst.delete()) {
delete(dst, EMPTY_DIRECTORIES_ONLY | RECURSIVE);
}
// On *nix there is no try, you do or do not
Files.move(toPath(src), toPath(dst), options);
return;
} catch (IOException e2) {
e2.addSuppressed(e);
finalError = e2;
}
// On *nix there is no try, you do or do not
Files.move(toPath(src), toPath(dst), options);
return;
} catch (IOException e2) {
// ignore and continue retry
}
}
try {
Thread.sleep(100);
} catch (InterruptedException e) {
throw new IOException(
MessageFormat.format(JGitText.get().renameFileFailed,
src.getAbsolutePath(), dst.getAbsolutePath()),
e);
if (attempts > 0) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
throw new IOException(MessageFormat.format(
JGitText.get().renameFileFailed,
src.getAbsolutePath(), dst.getAbsolutePath()), e);
}
}
}
throw new IOException(
MessageFormat.format(JGitText.get().renameFileFailed,
src.getAbsolutePath(), dst.getAbsolutePath()));
src.getAbsolutePath(), dst.getAbsolutePath()),
finalError);
}
/**