Index Merge Scheduler: Configuring using serial fails to load, closes

elastic#1901.
mute · May 2, 2012 · 1304af6 · 1304af6
1 parent 24814fd
commit 1304af6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java b/src/main/java/org/apache/lucene/index/TrackingConcurrentMergeScheduler.java
@@ -84,7 +84,7 @@ protected void doMerge(MergePolicy.OneMerge merge) throws IOException {
         currentMergesNumDocs.inc(totalNumDocs);
         currentMergesSizeInBytes.inc(totalSizeInBytes);
         if (logger.isTraceEnabled()) {
-            logger.trace("merge [{}] starting..., merging [{}]/[{}], into [{}]", merge.info.name, totalNumDocs, new ByteSizeValue(totalSizeInBytes), new ByteSizeValue(merge.estimatedMergeBytes));
+            logger.trace("merge [{}] starting..., merging [{}] segments, [{}] docs, [{}] size, into [{}] estimated_size", merge.info == null ? "_na_" : merge.info.name, merge.segments.size(), totalNumDocs, new ByteSizeValue(totalSizeInBytes), new ByteSizeValue(merge.estimatedMergeBytes));
         }
         try {
             TrackingMergeScheduler.setCurrentMerge(merge);
@@ -101,9 +101,9 @@ protected void doMerge(MergePolicy.OneMerge merge) throws IOException {
             totalMergesSizeInBytes.inc(totalSizeInBytes);
             totalMerges.inc(took);
             if (took > 20000) { // if more than 20 seconds, DEBUG log it
-                logger.debug("merge [{}] done, took [{}]", merge.info.name, TimeValue.timeValueMillis(took));
+                logger.debug("merge [{}] done, took [{}]", merge.info == null ? "_na_" : merge.info.name, TimeValue.timeValueMillis(took));
             } else if (logger.isTraceEnabled()) {
-                logger.trace("merge [{}] done, took [{}]", merge.info.name, TimeValue.timeValueMillis(took));
+                logger.trace("merge [{}] done, took [{}]", merge.info == null ? "_na_" : merge.info.name, TimeValue.timeValueMillis(took));
             }
         }
     }

diff --git a/src/main/java/org/apache/lucene/index/TrackingSerialMergeScheduler.java b/src/main/java/org/apache/lucene/index/TrackingSerialMergeScheduler.java
@@ -90,8 +90,9 @@ synchronized public void merge(IndexWriter writer) throws CorruptIndexException,
             currentMergesNumDocs.inc(totalNumDocs);
             currentMergesSizeInBytes.inc(totalSizeInBytes);
 
+            // sadly, segment name is not available since mergeInit is called from merge itself...
             if (logger.isTraceEnabled()) {
-                logger.trace("merge [{}] starting..., merging [{}]/[{}], into [{}]", merge.info.name, totalNumDocs, new ByteSizeValue(totalSizeInBytes), new ByteSizeValue(merge.estimatedMergeBytes));
+                logger.trace("merge [{}] starting..., merging [{}] segments, [{}] docs, [{}] size, into [{}] estimated_size", merge.info == null ? "_na_" : merge.info.name, merge.segments.size(), totalNumDocs, new ByteSizeValue(totalSizeInBytes), new ByteSizeValue(merge.estimatedMergeBytes));
             }
             try {
                 TrackingMergeScheduler.setCurrentMerge(merge);
@@ -108,9 +109,9 @@ synchronized public void merge(IndexWriter writer) throws CorruptIndexException,
                 totalMergesSizeInBytes.inc(totalSizeInBytes);
                 totalMerges.inc(took);
                 if (took > 20000) { // if more than 20 seconds, DEBUG log it
-                    logger.debug("merge [{}] done, took [{}]", merge.info.name, TimeValue.timeValueMillis(took));
+                    logger.debug("merge [{}] done, took [{}]", merge.info == null ? "_na_" : merge.info.name, TimeValue.timeValueMillis(took));
                 } else if (logger.isTraceEnabled()) {
-                    logger.trace("merge [{}] done, took [{}]", merge.info.name, TimeValue.timeValueMillis(took));
+                    logger.trace("merge [{}] done, took [{}]", merge.info == null ? "_na_" : merge.info.name, TimeValue.timeValueMillis(took));
                 }
             }
         }

diff --git a/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java b/src/main/java/org/elasticsearch/index/merge/scheduler/MergeSchedulerModule.java
@@ -42,7 +42,7 @@ public MergeSchedulerModule(Settings settings) {
     @Override
     protected void configure() {
         bind(MergeSchedulerProvider.class)
-                .to(settings.getAsClass(TYPE, ConcurrentMergeSchedulerProvider.class, "org.elasticsearch.index.scheduler.", "MergeSchedulerProvider"))
+                .to(settings.getAsClass(TYPE, ConcurrentMergeSchedulerProvider.class, "org.elasticsearch.index.merge.scheduler.", "MergeSchedulerProvider"))
                 .asEagerSingleton();
     }
 }