From a99ac0090894096b8dcf0055ee84db50e0cd83e5 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@google.com>
Date: Mon, 27 Nov 2017 16:27:20 +0100
Subject: [PATCH] Do not check groupsMigration status in
 GroupsNoteDbConsistencyChecker

During a test bulk migration, the real groupsMigration status is not
known or relevant.

Change-Id: Ia077547ec3011a45deba49d0c29b536a366a0b85
---
 .../db/GroupsNoteDbConsistencyChecker.java    | 20 +++----------------
 .../api/group/GroupsConsistencyIT.java        |  6 +-----
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java b/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java
index 265aba04da..e89743bcc6 100644
--- a/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java
+++ b/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java
@@ -15,7 +15,6 @@
 package com.google.gerrit.server.group.db;
 
 import static com.google.gerrit.extensions.api.config.ConsistencyCheckInfo.ConsistencyProblemInfo.error;
-import static com.google.gerrit.extensions.api.config.ConsistencyCheckInfo.ConsistencyProblemInfo.warning;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
@@ -25,7 +24,6 @@ import com.google.gerrit.extensions.api.config.ConsistencyCheckInfo.ConsistencyP
 import com.google.gerrit.reviewdb.client.AccountGroup;
 import com.google.gerrit.reviewdb.client.RefNames;
 import com.google.gerrit.server.group.InternalGroup;
-import com.google.gerrit.server.notedb.GroupsMigration;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -48,7 +46,6 @@ import org.eclipse.jgit.revwalk.RevWalk;
 /** Check the referential integrity of NoteDb group storage. */
 @Singleton
 public class GroupsNoteDbConsistencyChecker {
-  private final GroupsMigration groupsMigration;
 
   /**
    * The result of a consistency check. The UUID map is only non-null if no problems were detected.
@@ -60,20 +57,10 @@ public class GroupsNoteDbConsistencyChecker {
   }
 
   @Inject
-  GroupsNoteDbConsistencyChecker(GroupsMigration groupsMigration) {
-    this.groupsMigration = groupsMigration;
-  }
+  GroupsNoteDbConsistencyChecker() {}
 
-  /**
-   * Checks for problems with the given All-Users repo. Returns null if we are not writing to
-   * NoteDb.
-   */
-  @Nullable
+  /** Checks for problems with the given All-Users repo. */
   public Result check(Repository repo) throws IOException {
-    if (!groupsMigration.writeToNoteDb()) {
-      return null;
-    }
-
     Result r = doCheck(repo);
     if (!r.problems.isEmpty()) {
       r.uuidToGroupMap = null;
@@ -81,7 +68,6 @@ public class GroupsNoteDbConsistencyChecker {
     return r;
   }
 
-  @Nullable
   private Result doCheck(Repository repo) throws IOException {
     Result result = new Result();
     result.problems = new ArrayList<>();
@@ -136,7 +122,7 @@ public class GroupsNoteDbConsistencyChecker {
     Ref ref = refs.get(RefNames.REFS_GROUPNAMES);
     if (ref == null) {
       String msg = String.format("ref %s does not exist", RefNames.REFS_GROUPNAMES);
-      result.problems.add(groupsMigration.readFromNoteDb() ? error(msg) : warning(msg));
+      result.problems.add(error(msg));
       return;
     }
 
diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsConsistencyIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsConsistencyIT.java
index 3253d430bb..e4223012b1 100644
--- a/javatests/com/google/gerrit/acceptance/api/group/GroupsConsistencyIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsConsistencyIT.java
@@ -108,11 +108,7 @@ public class GroupsConsistencyIT extends AbstractDaemonTest {
       assertThat(result).isEqualTo(Result.FORCED);
     }
 
-    assertConsistency(
-        "refs/meta/group-names does not exist",
-        groupsMigration.readFromNoteDb()
-            ? ConsistencyProblemInfo.Status.ERROR
-            : ConsistencyProblemInfo.Status.WARNING);
+    assertError("refs/meta/group-names does not exist");
   }
 
   @Test