You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/01/09 10:30:43 UTC
svn commit: r1650463 -
/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
Author: mikemccand
Date: Fri Jan 9 09:30:43 2015
New Revision: 1650463
URL: http://svn.apache.org/r1650463
Log:
LUCENE-6119: set initial rate for forced merge correctly
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1650463&r1=1650462&r2=1650463&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Fri Jan 9 09:30:43 2015
@@ -722,7 +722,14 @@ public class ConcurrentMergeScheduler ex
}
}
- newMerge.rateLimiter.setMBPerSec(targetMBPerSec);
+ double rate;
+
+ if (newMerge.maxNumSegments != -1) {
+ rate = forceMergeMBPerSec;
+ } else {
+ rate = targetMBPerSec;
+ }
+ newMerge.rateLimiter.setMBPerSec(rate);
targetMBPerSecChanged();
}