commit b4c9c8dfe4ee362973464619581158f4b0228dff
author Adithya Chakilam <achakila@codeaurora.org> Fri Nov 05 09:29:39 2021 -0700
committer Adithya Chakilam <achakila@codeaurora.org> Fri Nov 05 09:29:39 2021 -0700
tree bea60637d3bb1eeb64e3dc84fd132771955e5463
parent 963727cb3b33e8430f8d1795aa3a00dfb8d7b422

Fix buggy Index-Interactive Executor

Specifying index.threads to a negative value is not using a
direct executor as mentioned in docs. This change fixes that
buggy behaviour.

Change-Id: I924615b5e882702b3bd77973be337d40453c6d32

java/com/google/gerrit/server/index/IndexModule.java

diff --git a/java/com/google/gerrit/server/index/IndexModule.java b/java/com/google/gerrit/server/index/IndexModule.java
index 9622084..a68ce2d 100644
--- a/java/com/google/gerrit/server/index/IndexModule.java
+++ b/java/com/google/gerrit/server/index/IndexModule.java
@@ -211,13 +211,14 @@
       return interactiveExecutor;
     }
     int threads = this.threads;
-    if (threads < 0) {
-      return MoreExecutors.newDirectExecutorService();
-    } else if (threads == 0) {
+    if (threads == 0) {
       threads =
           config.getInt(
               "index", null, "threads", Runtime.getRuntime().availableProcessors() / 2 + 1);
     }
+    if (threads < 0) {
+      return MoreExecutors.newDirectExecutorService();
+    }
     return MoreExecutors.listeningDecorator(
         workQueue.createQueue(threads, "Index-Interactive", true));
   }