commit f60f7d5ebdf2306b4c088b5da4a6be4b9028fd79
author Edwin Kempin <ekempin@google.com> Wed Dec 12 13:46:45 2018 +0100
committer Dave Borowitz <dborowitz@google.com> Fri Dec 14 10:14:02 2018 -0800
tree b9a9590713b1d22de10b6ee11e92e0dd3c8dcc59
parent fb53740ad7e2a9d3e0db82bed315850748f16164

AllProjectsCreator: Always init NoteDb schema

Change-Id: If127a898fc4a120df8c9132d2f929b944be5ad25
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/server/schema/AllProjectsCreator.java

diff --git a/java/com/google/gerrit/server/schema/AllProjectsCreator.java b/java/com/google/gerrit/server/schema/AllProjectsCreator.java
index 78324fa..c86f02b 100644
--- a/java/com/google/gerrit/server/schema/AllProjectsCreator.java
+++ b/java/com/google/gerrit/server/schema/AllProjectsCreator.java
@@ -49,7 +49,6 @@
 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 @@
   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 @@
       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 @@
 
       config.commitToNewRef(md, RefNames.REFS_CONFIG);
       initSequences(git, bru);
-      initSchemaVersion();
+
+      // init schema
+      versionManager.init();
+
       execute(git, bru);
     }
   }
@@ -274,12 +273,6 @@
     }
   }
 
-  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);