commit e0a93d921d2c8a813e473892e5c94efa0e6b9b85
author Dave Borowitz <dborowitz@google.com> Wed Jun 28 20:06:13 2017 -0400
committer Dave Borowitz <dborowitz@google.com> Thu Jun 29 10:32:42 2017 -0400
tree ad86ef45d4d7a6ca06332799bb9cb0be07e20699
parent e3b476074744d399f753c6c3dc8b804adfb2e77f

Fail reindexing more silently on shutdown

Change-Id: Ic22ac2dae64991a1149c73dc829fab6b98015580

gerrit-server/src/main/java/com/google/gerrit/server/index/SiteIndexer.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/SiteIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/SiteIndexer.java
index 69e1cf1..0d84be7 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/SiteIndexer.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/SiteIndexer.java
@@ -22,6 +22,7 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.eclipse.jgit.lib.ProgressMonitor;
@@ -104,6 +105,9 @@
     public void run() {
       try {
         future.get();
+      } catch (RejectedExecutionException e) {
+        // Server shutdown, don't spam the logs.
+        failSilently();
       } catch (ExecutionException | InterruptedException e) {
         fail(e);
       } catch (RuntimeException e) {
@@ -119,6 +123,10 @@
       }
     }
 
+    private void failSilently() {
+      ok.set(false);
+    }
+
     private void fail(Throwable t) {
       log.error("Failed to index " + desc, t);
       ok.set(false);

gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
index 40c37d19..37bb221 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
@@ -51,6 +51,7 @@
 import java.util.TreeSet;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.lib.Constants;
@@ -296,6 +297,9 @@
               indexer.index(cd);
               done.update(1);
               verboseWriter.println("Reindexed change " + cd.getId());
+            } catch (RejectedExecutionException e) {
+              // Server shutdown, don't spam the logs.
+              failSilently();
             } catch (Exception e) {
               fail("Failed to index change " + cd.getId(), true, e);
             }
@@ -322,5 +326,9 @@
 
       verboseWriter.println(error);
     }
+
+    private void failSilently() {
+      this.failed.update(1);
+    }
   }
 }