opendev/gerrit
Code Issues Proposed changes

Run indexing in sameThreadExecutor when index.threads <= 0

Browse Source 
Change-Id: I3fb5a2ec039335cd8962b4a0973fbff7de55842f
This commit is contained in:
Dave Borowitz
2013-10-09 12:16:44 -07:00
parent bb5a30f8a5
commit 88a274019f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
View File

@@ -19,7 +19,6 @@ import com.google.common.util.concurrent.MoreExecutors;
import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.git.WorkQueue.Executor;
import com.google.gerrit.server.query.change.ChangeQueryRewriter; import com.google.gerrit.server.query.change.ChangeQueryRewriter;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Injector; import com.google.inject.Injector;
@@ -108,13 +107,11 @@ public class IndexModule extends LifecycleModule {
if (threads <= 0) { if (threads <= 0) {
threads = config.getInt("index", null, "threads", 0); threads = config.getInt("index", null, "threads", 0);
} }
Executor executor;
if (threads <= 0) { if (threads <= 0) {
executor = workQueue.getDefaultQueue(); return MoreExecutors.sameThreadExecutor();
} else {
executor = workQueue.createQueue(threads, "index");
} }
return MoreExecutors.listeningDecorator(executor); return MoreExecutors.listeningDecorator(
workQueue.createQueue(threads, "index"));
} }
} }
} }