commit a4db0d5a42ef0a5fa3da16d58c79c75baaca9abb
author David Pursehouse <david.pursehouse@sonymobile.com> Sat Dec 19 21:20:33 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Mon Dec 21 20:17:24 2015 +0900
tree 241b0659fb2c903bb7e756cae6be8812e7806214
parent 22800b282a74a030d66bf76e22262529df0dcbc3

Handle missing objects error while migrating to schema version 108

If the migration encounters a missing object, it aborts with a
stack trace and the site is left in a corrputed state.

Catch the error and log a warning to the console.

Bug: Issue 3728
Change-Id: Ib9fdfc78666b85e327ab2d498ab85bb0a6f433ba

gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_108.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_108.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_108.java
index 4e76325..12a70eb 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_108.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_108.java
@@ -33,6 +33,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
+import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Ref;
@@ -72,7 +73,7 @@
         : openByProject.asMap().entrySet()) {
       try (Repository repo = repoManager.openRepository(e.getKey());
           RevWalk rw = new RevWalk(repo)) {
-        updateProjectGroups(db, repo, rw, (Set<Change.Id>) e.getValue());
+        updateProjectGroups(db, repo, rw, (Set<Change.Id>) e.getValue(), ui);
       } catch (IOException err) {
         throw new OrmException(err);
       }
@@ -84,7 +85,8 @@
   }
 
   private static void updateProjectGroups(ReviewDb db, Repository repo,
-      RevWalk rw, Set<Change.Id> changes) throws OrmException, IOException {
+      RevWalk rw, Set<Change.Id> changes, UpdateUI ui)
+          throws OrmException, IOException {
     // Match sorting in ReceiveCommits.
     rw.reset();
     rw.sort(RevSort.TOPO);
@@ -92,7 +94,7 @@
 
     RefDatabase refdb = repo.getRefDatabase();
     for (Ref ref : refdb.getRefs(Constants.R_HEADS).values()) {
-      RevCommit c = maybeParseCommit(rw, ref.getObjectId());
+      RevCommit c = maybeParseCommit(rw, ref.getObjectId(), ui);
       if (c != null) {
         rw.markUninteresting(c);
       }
@@ -110,7 +112,7 @@
       PatchSet.Id psId = PatchSet.Id.fromRef(ref.getName());
       if (psId != null && changes.contains(psId.getParentKey())) {
         patchSetsBySha.put(id, psId);
-        RevCommit c = maybeParseCommit(rw, id);
+        RevCommit c = maybeParseCommit(rw, id, ui);
         if (c != null) {
           rw.markStart(c);
         }
@@ -175,12 +177,16 @@
     return openByProject;
   }
 
-  private static RevCommit maybeParseCommit(RevWalk rw, ObjectId id)
+  private static RevCommit maybeParseCommit(RevWalk rw, ObjectId id, UpdateUI ui)
       throws IOException {
-    if (id == null) {
-      return null;
+    if (id != null) {
+      try {
+        RevObject obj = rw.parseAny(id);
+        return (obj instanceof RevCommit) ? (RevCommit) obj : null;
+      } catch (MissingObjectException moe) {
+        ui.message("Missing object: " + id.getName() + "\n");
+      }
     }
-    RevObject obj = rw.parseAny(id);
-    return (obj instanceof RevCommit) ? (RevCommit) obj : null;
+    return null;
   }
 }