diff options
Diffstat (limited to 'java/com/google/gerrit/server/index/IndexModule.java')
-rw-r--r-- | java/com/google/gerrit/server/index/IndexModule.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/java/com/google/gerrit/server/index/IndexModule.java b/java/com/google/gerrit/server/index/IndexModule.java index e7b892d611..612c637dfa 100644 --- a/java/com/google/gerrit/server/index/IndexModule.java +++ b/java/com/google/gerrit/server/index/IndexModule.java @@ -224,13 +224,14 @@ public class IndexModule extends LifecycleModule { 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)); } @@ -243,11 +244,13 @@ public class IndexModule extends LifecycleModule { if (batchExecutor != null) { return batchExecutor; } - int threads = config.getInt("index", null, "batchThreads", 0); + int threads = this.threads; + if (threads == 0) { + threads = + config.getInt("index", null, "batchThreads", Runtime.getRuntime().availableProcessors()); + } if (threads < 0) { return MoreExecutors.newDirectExecutorService(); - } else if (threads == 0) { - threads = Runtime.getRuntime().availableProcessors(); } return MoreExecutors.listeningDecorator(workQueue.createQueue(threads, "Index-Batch", true)); } |