honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't log merge failures twice

This commit is contained in:
Shay Banon 2013-02-27 20:23:33 +01:00
parent 7be8f431d5
commit e908c723f1
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/elasticsearch/index/merge/scheduler/ConcurrentMergeSchedulerProvider.java
View File

@ -19,7 +19,10 @@
package org.elasticsearch.index.merge.scheduler; 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.inject.Inject;
import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -84,16 +87,6 @@ public class ConcurrentMergeSchedulerProvider extends AbstractIndexShardComponen
this.provider = provider; 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 @Override
protected MergeThread getMergeThread(IndexWriter writer, MergePolicy.OneMerge merge) throws IOException { protected MergeThread getMergeThread(IndexWriter writer, MergePolicy.OneMerge merge) throws IOException {
MergeThread thread = super.getMergeThread(writer, merge); MergeThread thread = super.getMergeThread(writer, merge);