AllProjectsCreator: Always init NoteDb schema
Change-Id: If127a898fc4a120df8c9132d2f929b944be5ad25 Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
committed by
Dave Borowitz
parent
fb53740ad7
commit
f60f7d5ebd
@@ -49,7 +49,6 @@ import com.google.gerrit.server.git.GitRepositoryManager;
|
||||
import com.google.gerrit.server.git.meta.MetaDataUpdate;
|
||||
import com.google.gerrit.server.group.SystemGroupBackend;
|
||||
import com.google.gerrit.server.notedb.NoteDbSchemaVersionManager;
|
||||
import com.google.gerrit.server.notedb.NotesMigration;
|
||||
import com.google.gerrit.server.notedb.RepoSequence;
|
||||
import com.google.gerrit.server.project.ProjectConfig;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
@@ -74,7 +73,6 @@ public class AllProjectsCreator {
|
||||
private final GitRepositoryManager repositoryManager;
|
||||
private final AllProjectsName allProjectsName;
|
||||
private final PersonIdent serverUser;
|
||||
private final NotesMigration notesMigration;
|
||||
private final NoteDbSchemaVersionManager versionManager;
|
||||
private final ProjectConfig.Factory projectConfigFactory;
|
||||
private final GroupReference anonymous;
|
||||
@@ -93,14 +91,12 @@ public class AllProjectsCreator {
|
||||
GitRepositoryManager repositoryManager,
|
||||
AllProjectsName allProjectsName,
|
||||
@GerritPersonIdent PersonIdent serverUser,
|
||||
NotesMigration notesMigration,
|
||||
NoteDbSchemaVersionManager versionManager,
|
||||
SystemGroupBackend systemGroupBackend,
|
||||
ProjectConfig.Factory projectConfigFactory) {
|
||||
this.repositoryManager = repositoryManager;
|
||||
this.allProjectsName = allProjectsName;
|
||||
this.serverUser = serverUser;
|
||||
this.notesMigration = notesMigration;
|
||||
this.versionManager = versionManager;
|
||||
this.projectConfigFactory = projectConfigFactory;
|
||||
|
||||
@@ -237,7 +233,10 @@ public class AllProjectsCreator {
|
||||
|
||||
config.commitToNewRef(md, RefNames.REFS_CONFIG);
|
||||
initSequences(git, bru);
|
||||
initSchemaVersion();
|
||||
|
||||
// init schema
|
||||
versionManager.init();
|
||||
|
||||
execute(git, bru);
|
||||
}
|
||||
}
|
||||
@@ -274,12 +273,6 @@ public class AllProjectsCreator {
|
||||
}
|
||||
}
|
||||
|
||||
private void initSchemaVersion() throws IOException, OrmException {
|
||||
if (notesMigration.commitChangeWrites()) {
|
||||
versionManager.init();
|
||||
}
|
||||
}
|
||||
|
||||
private void execute(Repository git, BatchRefUpdate bru) throws IOException {
|
||||
try (RevWalk rw = new RevWalk(git)) {
|
||||
bru.execute(rw, NullProgressMonitor.INSTANCE);
|
||||
|
||||
Reference in New Issue
Block a user