commit 250a065b8080f2beb7ac002c3bc87b15f511f45f
author Dave Borowitz <dborowitz@google.com> Thu Dec 13 12:33:26 2018 -0800
committer Dave Borowitz <dborowitz@google.com> Fri Dec 14 10:18:24 2018 -0800
tree cc9cce0f42d858369642e1c0961579feacb2f826
parent 9150a1dd911565e3795ce72093bd7f38f2e8a4ab

NoteDbSchemaUpdater: Use local copy of PrimaryStorage enum

PrimaryStorage will go away, but this check is explicitly intended to
live through 3.0.

This has to be an enum rather than a simple string comparison on the
value from the Config because JGit's Config library has some non-obvious
semantics for getEnum, such as allowing "foo bar" for FOO_BAR.

Change-Id: Ifa951dfad3f7487211abcebe51d2e2150d693cba

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

diff --git a/java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java b/java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java
index 73fab13..0950d49 100644
--- a/java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java
+++ b/java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java
@@ -26,7 +26,6 @@
 import com.google.gerrit.server.config.AllUsersName;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.git.GitRepositoryManager;
-import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
 import com.google.gerrit.server.notedb.NoteDbSchemaVersionManager;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
@@ -121,6 +120,12 @@
     }
   }
 
+  // Config#getEnum requires this to be public, so give it an off-putting name.
+  public enum PrimaryStorageFor216Compatibility {
+    REVIEW_DB,
+    NOTE_DB
+  }
+
   private void checkNoteDbConfigFor216() throws OrmException {
     // Check that the NoteDb migration config matches what we expect from a site that both:
     // * Completed the change migration to NoteDB.
@@ -128,8 +133,9 @@
 
     if (!cfg.getBoolean("noteDb", "changes", "write", false)
         || !cfg.getBoolean("noteDb", "changes", "read", false)
-        || cfg.getEnum("noteDb", "changes", "primaryStorage", PrimaryStorage.REVIEW_DB)
-            != PrimaryStorage.NOTE_DB
+        || cfg.getEnum(
+                "noteDb", "changes", "primaryStorage", PrimaryStorageFor216Compatibility.REVIEW_DB)
+            != PrimaryStorageFor216Compatibility.NOTE_DB
         || !cfg.getBoolean("noteDb", "changes", "disableReviewDb", false)) {
       throw new OrmException(
           "You appear to be upgrading from a 2.x site, but the NoteDb change migration was"