motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.13' into stable-6.0 

* stable-5.13:
  If tryLock fails to get the lock another gc has it
  Fix GcConcurrentTest#testInterruptGc
  Don't swallow IOException in GC.PidLock#lock
  Check if FileLock is valid before using or releasing it

Change-Id: I708d0936fa86b028e4da4e7e21f332f8b48ad293
This commit is contained in:
Matthias Sohn 2023-02-22 21:02:09 +01:00
parent 2a2a208fa1 d9f75e8bb2
commit 238f1693f7
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java
View File

@ -14,10 +14,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
import java.nio.channels.ClosedByInterruptException;
import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.BrokenBarrierException;
@ -226,10 +226,8 @@ public void testInterruptGc() throws Exception {
if (cause instanceof CancelledException) {
assertEquals(JGitText.get().operationCanceled,
cause.getMessage());
} else if (cause instanceof IOException) {
Throwable cause2 = cause.getCause();
assertTrue(cause2 instanceof InterruptedException
|| cause2 instanceof ExecutionException);
} else if (cause instanceof ClosedByInterruptException) {
// thread was interrupted
} else {
fail("unexpected exception " + e);
}

10
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
View File

@ -1631,7 +1631,7 @@ private class PidLock implements AutoCloseable {
pidFile = repo.getDirectory().toPath().resolve(GC_PID);
}
boolean lock() {
boolean lock() throws IOException {
if (Files.exists(pidFile)) {
Instant mtime = FS.DETECTED
.lastModifiedInstant(pidFile.toFile());
@ -1649,8 +1649,8 @@ boolean lock() {
f = new RandomAccessFile(pidFile.toFile(), "rw"); //$NON-NLS-1$
channel = f.getChannel();
lock = channel.tryLock();
if (lock == null) {
failedToLock();
if (lock == null || !lock.isValid()) {
gcAlreadyRunning();
return false;
}
channel.write(ByteBuffer
@ -1670,7 +1670,7 @@ boolean lock() {
JGitText.get().closePidLockFailed, pidFile),
e1);
}
return false;
throw e;
}
return true;
}
@ -1728,7 +1728,7 @@ private String getHostName() {
public void close() {
boolean wasLocked = false;
try {
if (lock != null) {
if (lock != null && lock.isValid()) {
lock.release();
wasLocked = true;
}