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:33:06 UTC

svn commit: r1650464 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java

Author: mikemccand
Date: Fri Jan  9 09:33:05 2015
New Revision: 1650464

URL: http://svn.apache.org/r1650464
Log:
LUCENE-6119: set initial rate for forced merge correctly

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java

Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1650464&r1=1650463&r2=1650464&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Fri Jan  9 09:33:05 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();
   }