elastic#5882 keep the CMS settings configurable; just change the defa…

…ults to Lucene's
mikemccand · Apr 22, 2014 · 6ce7153 · 6ce7153
1 parent 561612c
commit 6ce7153
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java b/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java
@@ -53,8 +53,8 @@ public class ConcurrentMergeSchedulerProvider extends MergeSchedulerProvider {
     public ConcurrentMergeSchedulerProvider(ShardId shardId, @IndexSettings Settings indexSettings, ThreadPool threadPool) {
         super(shardId, indexSettings, threadPool);
 
-        this.maxThreadCount = ConcurrentMergeScheduler.DEFAULT_MAX_THREAD_COUNT;
-        this.maxMergeCount = ConcurrentMergeScheduler.DEFAULT_MAX_MERGE_COUNT;
+        this.maxThreadCount = componentSettings.getAsInt("max_thread_count", ConcurrentMergeScheduler.DEFAULT_MAX_THREAD_COUNT);
+        this.maxMergeCount = componentSettings.getAsInt("max_merge_count", ConcurrentMergeScheduler.DEFAULT_MAX_MERGE_COUNT);
         logger.debug("using [concurrent] merge scheduler with max_thread_count[{}]", maxThreadCount);
     }