]> source.dussan.org Git - jgit.git/commitdiff
Add tests for handling pack files removal during fetch 23/1176123/1
authorDariusz Luksza <dariusz.luksza@gmail.com>
Fri, 17 Nov 2023 19:28:53 +0000 (19:28 +0000)
committerDariusz Luksza <dariusz.luksza@gmail.com>
Mon, 29 Jan 2024 09:24:26 +0000 (09:24 +0000)
Although this could sound like a corner case, it really can occur out
there in the real world. Especially in the Gerrit world where the
repositories could be GC'ed on a separate process or system.

The `FileNotFoundException` seems to be handled correctly in
`PackFile#doOpen` (line 671) and it will mark the pack as invalid. But
triggering that code path was not an easy task.

First of all, we need to add a new commit to the `master` branch of the
test repository after `UploadPack` object is created.

Secondly, in the refspec for fetch, commit id instead of "regular"
refspec must be used.

With both in place, we can see a warning log statement about deleted
pack file. And the fetch succeeds!

Also, tests for the removal of *.idx and *.bitmap files were added.

This unveiled a corner for the *.idx file deletion while fetching, as
the test will fail with "Unreachable pack index" IOException only
when the HEAD commit is empty.

Change-Id: If26c83f9b12993d1ab7d6bad6bd863c29520b062
Signed-off-by: Dariusz Luksza <dariusz.luksza@gmail.com>
(cherry picked from commit ba5adc4ce6f234cb300b0f73a1efdba9bba1b5d8)

org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackHandleDeletedPackFileTest.java [new file with mode: 0644]

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackHandleDeletedPackFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackHandleDeletedPackFileTest.java
new file mode 100644 (file)
index 0000000..b1c9447
--- /dev/null
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2023, Dariusz Luksza <dariusz.luksza@gmail.com> and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0 which is available at
+ * https://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+package org.eclipse.jgit.transport;
+
+import static org.junit.Assert.fail;
+import static org.eclipse.jgit.lib.Constants.HEAD;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
+import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.GC;
+import org.eclipse.jgit.internal.storage.file.Pack;
+import org.eclipse.jgit.internal.storage.pack.PackExt;
+import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
+import org.eclipse.jgit.junit.TestRepository;
+import org.eclipse.jgit.junit.TestRepository.CommitBuilder;
+import org.eclipse.jgit.lib.NullProgressMonitor;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.transport.UploadPack.RequestPolicy;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class UploadPackHandleDeletedPackFileTest
+               extends LocalDiskRepositoryTestCase {
+
+       private FileRepository server;
+
+       private TestRepository<FileRepository> remote;
+
+       private Repository client;
+
+       private RevCommit head;
+
+       @Parameter
+       public boolean emptyCommit;
+
+       @Parameters(name="empty commit: {0}")
+       public static Collection<Boolean[]> initTestData() {
+               return Arrays.asList(
+                               new Boolean[][] { { Boolean.TRUE }, { Boolean.FALSE } });
+       }
+
+       @Before
+       @Override
+       public void setUp() throws Exception {
+               super.setUp();
+               server = createBareRepository();
+               server.getConfig().setString("protocol", null, "version", "2");
+
+               remote = new TestRepository<>(server);
+               client = new InMemoryRepository(new DfsRepositoryDescription("client"));
+
+               setupServerRepo();
+               head = server.parseCommit(server.resolve(HEAD));
+       }
+
+       @Test
+       public void testV2PackFileRemovedDuringUploadPack() throws Exception {
+               doRemovePackFileDuringUploadPack(PackExt.PACK);
+       }
+
+       @Test
+       @Ignore("pending fix")
+       public void testV2IdxFileRemovedDuringUploadPack() throws Exception {
+               doRemovePackFileDuringUploadPack(PackExt.INDEX);
+       }
+
+       @Test
+       public void testV2BitmapFileRemovedDuringUploadPack() throws Exception {
+               doRemovePackFileDuringUploadPack(PackExt.BITMAP_INDEX);
+       }
+
+       private void doRemovePackFileDuringUploadPack(PackExt packExt)
+                       throws Exception {
+               Object ctx = new Object();
+               TestProtocol testProtocol = new TestProtocol<>(
+                               (Object req, Repository db) -> {
+                                       UploadPack up = new UploadPack(db);
+                                       up.setRequestPolicy(RequestPolicy.REACHABLE_COMMIT);
+                                       Collection<Pack> packs = server.getObjectDatabase()
+                                                       .getPacks();
+                                       assertEquals("single pack expected", 1, packs.size());
+                                       Pack pack = packs.iterator().next();
+
+                                       try {
+                                               addNewCommit();
+
+                                               new GC(remote.getRepository()).gc();
+
+                                               pack.getPackFile().create(packExt).delete();
+                                       } catch (Exception e) {
+                                               fail("GC or pack file removal failed");
+                                       }
+
+                                       return up;
+                               }, null);
+
+               URIish uri = testProtocol.register(ctx, server);
+
+               try (Transport tn = testProtocol.open(uri, client, "server")) {
+                       tn.fetch(NullProgressMonitor.INSTANCE,
+                                       Collections.singletonList(new RefSpec(head.name())));
+                       assertTrue(client.getObjectDatabase().has(head));
+               }
+       }
+
+       private void addNewCommit() throws Exception {
+               CommitBuilder commit = remote.commit().message("2");
+               if (!emptyCommit) {
+                       commit = commit.add("test2.txt", remote.blob("2"));
+               }
+               remote.update("master", commit.parent(head).create());
+       }
+
+       private void setupServerRepo() throws Exception {
+               RevCommit commit0 = remote.commit().message("0")
+                               .add("test.txt", remote.blob("0"))
+                               .create();
+               remote.update("master", commit0);
+
+               new GC(remote.getRepository()).gc(); // create pack files
+
+               head = remote.commit().message("1").parent(commit0)
+                               .add("test1.txt", remote.blob("1"))
+                               .create();
+               remote.update("master", head);
+       }
+}
\ No newline at end of file