diff --git a/org.eclipse.jgit.junit.ssh/.settings/.api_filters b/org.eclipse.jgit.junit.ssh/.settings/.api_filters new file mode 100644 index 000000000..44c9dfae4 --- /dev/null +++ b/org.eclipse.jgit.junit.ssh/.settings/.api_filters @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshBasicTestBase.java b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshBasicTestBase.java index f9ca0b892..da84b0ea7 100644 --- a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshBasicTestBase.java +++ b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshBasicTestBase.java @@ -22,6 +22,8 @@ * Some minimal cloning and fetching tests. Concrete subclasses can implement * the abstract operations from {@link SshTestHarness} to run with different SSH * implementations. + * + * @since 5.11 */ public abstract class SshBasicTestBase extends SshTestHarness { diff --git a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java index 90d981b77..a28d5ebd9 100644 --- a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java +++ b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java @@ -76,6 +76,9 @@ public abstract class SshTestHarness extends RepositoryTestCase { protected File publicKey1; + /** + * @since 5.10 + */ protected File publicKey2; protected SshTestGitServer server; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackMismatchException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackMismatchException.java index 44b8e0193..7a2c70de7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackMismatchException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackMismatchException.java @@ -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$ + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java index 2bee58f1d..53fdc6608 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java @@ -31,6 +31,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; @@ -365,7 +366,8 @@ private ObjectLoader openObjectWithoutRestoring(WindowCursor curs, AnyObjectId o } private ObjectLoader openPackedFromSelfOrAlternate(WindowCursor curs, - AnyObjectId objectId, Set skips) { + AnyObjectId objectId, Set skips) + throws PackMismatchException { ObjectLoader ldr = openPackedObject(curs, objectId); if (ldr != null) { return ldr; @@ -401,7 +403,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); } @@ -436,7 +439,8 @@ private long getObjectSizeWithoutRestoring(WindowCursor curs, } private long getPackedSizeFromSelfOrAlternate(WindowCursor curs, - AnyObjectId id, Set skips) { + AnyObjectId id, Set skips) + throws PackMismatchException { long len = packed.getSize(curs, id); if (0 <= len) { return len; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index a7f28c677..6a99cb3d8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -60,6 +60,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]); @@ -209,9 +211,11 @@ boolean resolve(Set 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) { @@ -223,6 +227,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) { @@ -235,9 +240,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) { @@ -250,6 +257,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) { @@ -263,8 +271,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 { @@ -279,6 +288,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) { @@ -289,6 +299,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;