motiejus
/
jgit
1
Fork 0
Code Releases Activity

reftable: tweaks for Windows 

Reload the stack _before_ trying to delete the files. This ensures we
don't trip over our own open file handles when deleting compacted
tables.

If there is another process reading the file, it may be impossible to
delete the compacted tables. In this case, ignore the failure.

For cleaning the garbage in this case, the protocol as described in
https://www.git-scm.com/docs/reftable#_windows should be implemented.
This is left for another commit.

Bug: 578454
Change-Id: I7aa43508450041eb9376d9f67a0262ff7cc53c73
This commit is contained in:
Han-Wen Nienhuys 2022-01-31 12:23:55 +01:00
parent 424c861477
commit a650ae8ad3
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableStackTest.java
View File

@ -14,6 +14,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import java.io.File;
import java.io.FileNotFoundException;
@ -32,10 +33,12 @@
import org.eclipse.jgit.lib.ObjectIdRef;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.util.SystemReader;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class FileReftableStackTest {
private static Ref newRef(String name, ObjectId id) {
@ -118,6 +121,9 @@ public void testCompaction1024() throws Exception {
@SuppressWarnings({ "resource", "unused" })
@Test
public void missingReftable() throws Exception {
// Can't delete in-use files on Windows.
assumeFalse(SystemReader.getInstance().isWindows());
try (FileReftableStack stack = new FileReftableStack(
new File(reftableDir, "refs"), reftableDir, null,
() -> new Config())) {

13
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableStack.java
View File

@ -40,6 +40,7 @@
import org.eclipse.jgit.internal.storage.reftable.ReftableWriter;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.util.SystemReader;
/**
* A mutable stack of reftables on local filesystem storage. Not thread-safe.
@ -527,11 +528,19 @@ boolean compactRange(int first, int last) throws IOException {
return false;
}
reload();
for (File f : deleteOnSuccess) {
Files.delete(f.toPath());
try {
Files.delete(f.toPath());
} catch (IOException e) {
// Ignore: this can happen on Windows in case of concurrent processes.
// leave the garbage and continue.
if (!SystemReader.getInstance().isWindows()) {
throw e;
}
}
}
reload();
return true;
} finally {
if (tmpTable != null) {