motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.10' into stable-5.11 

* stable-5.10:
  Add missing since tag for SshTestHarness#publicKey2
  Silence API errors
  Prevent infinite loop rescanning the pack list on
PackMismatchException
  Remove blank in maven.config

Migrated "Prevent infinite loop rescanning the pack list on
PackMismatchException" to refactoring done in
https://git.eclipse.org/r/q/topic:restore-preserved-packs

Change-Id: I0fb77bb9b498d48d5da88a93486b99bf8121e3bd
This commit is contained in:
Matthias Sohn 2023-04-20 14:42:56 +02:00
parent c7335f32e9 4f662a26f9
commit 48b0781cfe
8 changed files with 87 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mvn/maven.config
View File

@ -1 +1 @@
-T 1C
-T1C

11
org.eclipse.jgit.archive/.settings/.api_filters
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit.archive" version="2">
<resource path="src/org/eclipse/jgit/archive/BaseFormat.java" type="org.eclipse.jgit.archive.BaseFormat">
<filter id="336658481">
<message_arguments>
<message_argument value="org.eclipse.jgit.archive.BaseFormat"/>
<message_argument value="COMPRESSION_LEVEL"/>
</message_arguments>
</filter>
</resource>
</component>

25
org.eclipse.jgit.junit.ssh/.settings/.api_filters Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit.junit.ssh" version="2">
<resource path="src/org/eclipse/jgit/junit/ssh/SshTestHarness.java" type="org.eclipse.jgit.junit.ssh.SshTestHarness">
<filter id="336658481">
<message_arguments>
<message_argument value="org.eclipse.jgit.junit.ssh.SshTestHarness"/>
<message_argument value="publicKey2"/>
</resource>
<resource path="META-INF/MANIFEST.MF">
<filter id="923795461">
<message_arguments>
<message_argument value="5.11.2"/>
<message_argument value="5.10.0"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/junit/ssh/SshTestBase.java" type="org.eclipse.jgit.junit.ssh.SshTestBase">
<filter id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.junit.ssh.SshTestBase"/>
<message_argument value="testSshWithConfig()"/>
</message_arguments>
</filter>
</resource>
</component>

3
org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java
View File

@ -76,6 +76,9 @@ public abstract class SshTestHarness extends RepositoryTestCase {
protected File publicKey1;
/**
* @since 5.10
*/
protected File publicKey2;
protected SshTestGitServer server;

57
org.eclipse.jgit/.settings/.api_filters
View File

@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit" version="2">
<resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
<filter id="338755678">
<message_arguments>
<message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
<message_argument value="CONFIG_REFSTORAGE_REFTREE"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/revwalk/ObjectWalk.java" type="org.eclipse.jgit.revwalk.ObjectWalk">
<filter id="421654647">
<message_arguments>
<message_argument value="org.eclipse.jgit.revwalk.ObjectWalk"/>
<message_argument value="createObjectReachabilityChecker()"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/revwalk/RevWalk.java" type="org.eclipse.jgit.revwalk.RevWalk">
<filter id="421654647">
<message_arguments>
<message_argument value="org.eclipse.jgit.revwalk.RevWalk"/>
<message_argument value="createReachabilityChecker()"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
<filter id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.util.FS"/>
<message_argument value="internalRunHookIfPresent(Repository, String, String[], PrintStream, PrintStream, String)"/>
</message_arguments>
</filter>
<filter id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.util.FS"/>
<message_argument value="runHookIfPresent(Repository, String, String[], PrintStream, PrintStream, String)"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/util/FS_POSIX.java" type="org.eclipse.jgit.util.FS_POSIX">
<filter id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.util.FS_POSIX"/>
<message_argument value="runHookIfPresent(Repository, String, String[], PrintStream, PrintStream, String)"/>
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/util/FS_Win32_Cygwin.java" type="org.eclipse.jgit.util.FS_Win32_Cygwin">
<filter id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.util.FS_Win32_Cygwin"/>
<message_argument value="runHookIfPresent(Repository, String, String[], PrintStream, PrintStream, String)"/>
</message_arguments>
</filter>
</resource>
</component>

29
org.eclipse.jgit/src/org/eclipse/jgit/errors/PackMismatchException.java
View File

@ -18,6 +18,8 @@
public class PackMismatchException extends IOException {
private static final long serialVersionUID = 1L;
private boolean permanent;
/**
* Construct a pack modification error.
*
@ -27,4 +29,31 @@ public class PackMismatchException extends IOException {
public PackMismatchException(String why) {
super(why);
}
/**
* Set the type of the exception
*
* @param permanent
* whether the exception is considered permanent
* @since 5.9.1
*/
public void setPermanent(boolean permanent) {
this.permanent = permanent;
}
/**
* Check if this is a permanent problem
*
* @return if this is a permanent problem and repeatedly scanning the
* packlist couldn't fix it
* @since 5.9.1
*/
public boolean isPermanent() {
return permanent;
}
@Override
public String toString() {
return super.toString() + ", permanent: " + permanent; //$NON-NLS-1$
}
}

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

@ -30,6 +30,7 @@
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jgit.errors.PackMismatchException;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.internal.storage.pack.ObjectToPack;
import org.eclipse.jgit.internal.storage.pack.PackExt;
@ -350,7 +351,8 @@ private ObjectLoader openObjectWithoutRestoring(WindowCursor curs, AnyObjectId o
}
private ObjectLoader openPackedFromSelfOrAlternate(WindowCursor curs,
AnyObjectId objectId, Set<AlternateHandle.Id> skips) {
AnyObjectId objectId, Set<AlternateHandle.Id> skips)
throws PackMismatchException {
ObjectLoader ldr = openPackedObject(curs, objectId);
if (ldr != null) {
return ldr;
@ -386,7 +388,8 @@ private ObjectLoader openLooseFromSelfOrAlternate(WindowCursor curs,
return null;
}
ObjectLoader openPackedObject(WindowCursor curs, AnyObjectId objectId) {
ObjectLoader openPackedObject(WindowCursor curs, AnyObjectId objectId)
throws PackMismatchException {
return packed.open(curs, objectId);
}
@ -421,7 +424,8 @@ private long getObjectSizeWithoutRestoring(WindowCursor curs,
}
private long getPackedSizeFromSelfOrAlternate(WindowCursor curs,
AnyObjectId id, Set<AlternateHandle.Id> skips) {
AnyObjectId id, Set<AlternateHandle.Id> skips)
throws PackMismatchException {
long len = packed.getSize(curs, id);
if (0 <= len) {
return len;

25
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java
View File

@ -59,6 +59,8 @@ class PackDirectory {
private final static Logger LOG = LoggerFactory
.getLogger(PackDirectory.class);
private static final int MAX_PACKLIST_RESCAN_ATTEMPTS = 5;
private static final PackList NO_PACKS = new PackList(FileSnapshot.DIRTY,
new Pack[0]);
@ -201,9 +203,11 @@ boolean resolve(Set<ObjectId> matches, AbbreviatedObjectId id,
return true;
}
ObjectLoader open(WindowCursor curs, AnyObjectId objectId) {
ObjectLoader open(WindowCursor curs, AnyObjectId objectId)
throws PackMismatchException {
PackList pList;
do {
int retries = 0;
SEARCH: for (;;) {
pList = packList.get();
for (Pack p : pList.packs) {
@ -215,6 +219,7 @@ ObjectLoader open(WindowCursor curs, AnyObjectId objectId) {
} catch (PackMismatchException e) {
// Pack was modified; refresh the entire pack list.
if (searchPacksAgain(pList)) {
retries = checkRescanPackThreshold(retries, e);
continue SEARCH;
}
} catch (IOException e) {
@ -227,9 +232,11 @@ ObjectLoader open(WindowCursor curs, AnyObjectId objectId) {
return null;
}
long getSize(WindowCursor curs, AnyObjectId id) {
long getSize(WindowCursor curs, AnyObjectId id)
throws PackMismatchException {
PackList pList;
do {
int retries = 0;
SEARCH: for (;;) {
pList = packList.get();
for (Pack p : pList.packs) {
@ -242,6 +249,7 @@ long getSize(WindowCursor curs, AnyObjectId id) {
} catch (PackMismatchException e) {
// Pack was modified; refresh the entire pack list.
if (searchPacksAgain(pList)) {
retries = checkRescanPackThreshold(retries, e);
continue SEARCH;
}
} catch (IOException e) {
@ -255,8 +263,9 @@ long getSize(WindowCursor curs, AnyObjectId id) {
}
void selectRepresentation(PackWriter packer, ObjectToPack otp,
WindowCursor curs) {
WindowCursor curs) throws PackMismatchException {
PackList pList = packList.get();
int retries = 0;
SEARCH: for (;;) {
for (Pack p : pList.packs) {
try {
@ -268,6 +277,7 @@ void selectRepresentation(PackWriter packer, ObjectToPack otp,
} catch (PackMismatchException e) {
// Pack was modified; refresh the entire pack list.
//
retries = checkRescanPackThreshold(retries, e);
pList = scanPacks(pList);
continue SEARCH;
} catch (IOException e) {
@ -278,6 +288,15 @@ void selectRepresentation(PackWriter packer, ObjectToPack otp,
}
}
private int checkRescanPackThreshold(int retries, PackMismatchException e)
throws PackMismatchException {
if (retries++ > MAX_PACKLIST_RESCAN_ATTEMPTS) {
e.setPermanent(true);
throw e;
}
return retries;
}
private void handlePackError(IOException e, Pack p) {
String warnTmpl = null;
int transientErrorCount = 0;