diff --git a/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java b/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java index e097a9afbd3..a5a2013bdad 100644 --- a/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java +++ b/src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java @@ -19,7 +19,10 @@ package org.elasticsearch.index.merge.scheduler; -import org.apache.lucene.index.*; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.MergePolicy; +import org.apache.lucene.index.MergeScheduler; +import org.apache.lucene.index.TrackingConcurrentMergeScheduler; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; @@ -84,16 +87,6 @@ public class ConcurrentMergeSchedulerProvider extends AbstractIndexShardComponen this.provider = provider; } - @Override - public void merge(IndexWriter writer) throws CorruptIndexException, IOException { - try { - super.merge(writer); - } catch (IOException e) { - logger.warn("failed to merge", e); - throw e; - } - } - @Override protected MergeThread getMergeThread(IndexWriter writer, MergePolicy.OneMerge merge) throws IOException { MergeThread thread = super.getMergeThread(writer, merge);