diff options
author | Marco Miller <marco.miller@ericsson.com> | 2021-03-09 10:49:08 -0500 |
---|---|---|
committer | Marco Miller <marco.miller@ericsson.com> | 2021-03-09 10:49:08 -0500 |
commit | 36ffd21f48b1e483ac19a89f2c09dc0e01cf61ba (patch) | |
tree | 748a8a573a0fb8cead50951e28b9696bfcbecaa3 | |
parent | 240cb3802166a2da680ac2c25396f8098c51c4c2 (diff) | |
parent | ff08eb8008e203cce7530b037279c11bfccc218c (diff) |
Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Update git submodules
GitRepositoryManager should be responsible to enable/disable the GC
Change-Id: Ifb24ee4c8051145068c09b74102c6dacb1a96949
5 files changed, 78 insertions, 2 deletions
diff --git a/java/com/google/gerrit/server/git/GitRepositoryManager.java b/java/com/google/gerrit/server/git/GitRepositoryManager.java index f8d8a49062..01bbe89abd 100644 --- a/java/com/google/gerrit/server/git/GitRepositoryManager.java +++ b/java/com/google/gerrit/server/git/GitRepositoryManager.java @@ -57,4 +57,13 @@ public interface GitRepositoryManager { /** @return set of all known projects, sorted by natural NameKey order. */ SortedSet<Project.NameKey> list(); + + /** + * Check if garbage collection can be performed by the repository manager. + * + * @return true if repository can perform garbage collection. + */ + default Boolean canPerformGC() { + return false; + } } diff --git a/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java b/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java index 85822a8997..1fdf194016 100644 --- a/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java +++ b/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java @@ -199,6 +199,11 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager { } } + @Override + public Boolean canPerformGC() { + return true; + } + private boolean isUnreasonableName(Project.NameKey nameKey) { final String name = nameKey.get(); diff --git a/java/com/google/gerrit/server/restapi/project/GarbageCollect.java b/java/com/google/gerrit/server/restapi/project/GarbageCollect.java index 23115ded26..800e75e29c 100644 --- a/java/com/google/gerrit/server/restapi/project/GarbageCollect.java +++ b/java/com/google/gerrit/server/restapi/project/GarbageCollect.java @@ -29,7 +29,6 @@ import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.UrlFormatter; import com.google.gerrit.server.git.GarbageCollection; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.git.LocalDiskRepositoryManager; import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.ioutil.HexFormat; import com.google.gerrit.server.project.ProjectResource; @@ -66,7 +65,7 @@ public class GarbageCollect DynamicItem<UrlFormatter> urlFormatter) { this.workQueue = workQueue; this.urlFormatter = urlFormatter; - this.canGC = repoManager instanceof LocalDiskRepositoryManager; + this.canGC = repoManager.canPerformGC(); this.garbageCollectionFactory = garbageCollectionFactory; } diff --git a/javatests/com/google/gerrit/server/git/GitRepositoryManagerTest.java b/javatests/com/google/gerrit/server/git/GitRepositoryManagerTest.java new file mode 100644 index 0000000000..ea4a199c71 --- /dev/null +++ b/javatests/com/google/gerrit/server/git/GitRepositoryManagerTest.java @@ -0,0 +1,58 @@ +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package com.google.gerrit.server.git; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.gerrit.reviewdb.client.Project.NameKey; +import com.google.gerrit.testing.GerritBaseTests; +import java.io.IOException; +import java.util.SortedSet; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.Repository; +import org.junit.Before; +import org.junit.Test; + +public class GitRepositoryManagerTest extends GerritBaseTests { + + private GitRepositoryManager objectUnderTest; + + @Before + public void setUp() throws Exception { + objectUnderTest = new TestGitRepositoryManager(); + } + + @Test + public void shouldReturnFalseWhenDefaultCanPerformGC() { + assertThat(objectUnderTest.canPerformGC()).isFalse(); + } + + private static class TestGitRepositoryManager implements GitRepositoryManager { + @Override + public Repository openRepository(NameKey name) throws RepositoryNotFoundException, IOException { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public Repository createRepository(NameKey name) + throws RepositoryCaseMismatchException, RepositoryNotFoundException, IOException { + throw new UnsupportedOperationException("Not implemented"); + } + + @Override + public SortedSet<NameKey> list() { + throw new UnsupportedOperationException("Not implemented"); + } + } +} diff --git a/javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java b/javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java index 821a6e6b10..4948a12f66 100644 --- a/javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java +++ b/javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java @@ -208,6 +208,11 @@ public class LocalDiskRepositoryManagerTest extends GerritBaseTests { newRepoManager.createRepository(new Project.NameKey("A")); } + @Test + public void testRepositoryCanPerformGC() throws Exception { + assertThat(repoManager.canPerformGC()).isTrue(); + } + private void createSymLink(Project.NameKey project, String link) throws IOException { Path base = repoManager.getBasePath(project); Path projectDir = base.resolve(project.get() + ".git"); |