Delegate ref storage conversion to the repository manager SharedRefDbGitRepositoryManager relies on the default implementation of convertRefStorage (Ic35569ef), which rejects ref storage conversion. Delegate the operation to the underlying repository manager so that repositories can be converted when global-refdb is installed. Bug: Issue 579989817 Change-Id: Ifcbbbc4c4c23e8816ada70c9aca95ab10778b197
diff --git a/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManager.java b/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManager.java index 9c7fe69..b3f0fad 100644 --- a/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManager.java +++ b/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManager.java
@@ -29,6 +29,7 @@ import java.io.IOException; import java.util.NavigableSet; import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.RefStorageFormat; import org.eclipse.jgit.lib.Repository; /** @@ -132,6 +133,13 @@ return repositoryManager().getRepositoryStatus(name); } + @Override + public boolean convertRefStorage( + Project.NameKey name, RefStorageFormat format, boolean writeLogs, boolean backup) + throws IOException { + return repositoryManager().convertRefStorage(name, format, writeLogs, backup); + } + private Repository wrap(Project.NameKey projectName, Repository projectRepo) { return sharedRefDbRepoFactory.create(projectName.get(), projectRepo, ignoredRefs); }
diff --git a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManagerTest.java b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManagerTest.java index 8c2679b..8b3fa4e 100644 --- a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManagerTest.java +++ b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManagerTest.java
@@ -29,6 +29,7 @@ import com.google.inject.TypeLiteral; import com.google.inject.name.Names; import java.util.Collections; +import org.eclipse.jgit.lib.RefStorageFormat; import org.eclipse.jgit.lib.Repository; import org.junit.Before; import org.junit.Test; @@ -148,6 +149,20 @@ } @Test + public void convertRefStorageShouldDelegateToLocalDiskRepositoryManager() throws Exception { + doReturn(true) + .when(localDiskRepositoryManagerMock) + .convertRefStorage(A_TEST_PROJECT_NAME_KEY, RefStorageFormat.REFTABLE, true, false); + + assertThat( + msRepoMgr.convertRefStorage( + A_TEST_PROJECT_NAME_KEY, RefStorageFormat.REFTABLE, true, false)) + .isTrue(); + verify(localDiskRepositoryManagerMock) + .convertRefStorage(A_TEST_PROJECT_NAME_KEY, RefStorageFormat.REFTABLE, true, false); + } + + @Test public void listShouldDelegateToLocalDiskRepositoryManager() { doReturn(Collections.emptySortedSet()).when(localDiskRepositoryManagerMock).list();