commit 5a459ca62aa933ffa76797593915e8fc928888ff
author David Pursehouse <dpursehouse@collab.net> Sun Mar 18 12:34:53 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Sun Mar 18 12:34:53 2018 +0900
tree 9972f56c6f919ba5fe148186dda104b0164ba522
parent 3c62aa0d0bb0abc10d75f2eb0909ed072f774bb0
parent c1c2a5404a6a3a1eb86920a555ab6cd3dbb6ca56

Merge branch 'stable-2.15'

* stable-2.15:
  Fix logic in NoteDbMigrator#canSkipPrimaryStorageMigration

Change-Id: Ib6642b8b38556ab2f5d906bac25d2160dedd2522

java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java

diff --git a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
index 216e95a..c11aeef 100644
--- a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
+++ b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
@@ -667,10 +667,10 @@
    */
   private static boolean canSkipPrimaryStorageMigration(ReviewDb db, Change.Id id) {
     try {
-      return Iterables.isEmpty(db.patchSets().byChange(id));
+      return Iterables.isEmpty(unwrapDb(db).patchSets().byChange(id));
     } catch (Exception e) {
-      log.error("Error checking if change " + id + " is corrupt, assuming yes", e);
-      return true;
+      log.error("Error checking if change " + id + " can be skipped, assuming no", e);
+      return false;
     }
   }