opendev/gerrit
Code Issues Proposed changes

Remove deprecated changeMerge thread pool size configurations

Browse Source 
changeMerge.threadPoolSize and changeMerge.interactiveThreadPoolSize are
deprecated since 2.11, it's time to remove them.

Change-Id: I1c799954b9afabff7dac3da10f53bb7e9bdde916
This commit is contained in:
Hugo Arès
2016-05-06 08:38:22 -04:00
parent 058d69ae17
commit 1cf252cabd
2 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,10 +139,6 @@ public class IndexModule extends LifecycleModule {
if (threads <= 0) {
threads = config.getInt("index", null, "threads", 0);
}
if (threads <= 0) {
threads =
config.getInt("changeMerge", null, "interactiveThreadPoolSize", 0);
}
if (threads <= 0) {
return MoreExecutors.newDirectExecutorService();
}
@@ -160,9 +156,6 @@ public class IndexModule extends LifecycleModule {
return batchExecutor;
}
int threads = config.getInt("index", null, "batchThreads", 0);
if (threads <= 0) {
threads = config.getInt("changeMerge", null, "threadPoolSize", 0);
}
if (threads <= 0) {
threads = Runtime.getRuntime().availableProcessors();
}