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 2014/12/19 21:10:59 UTC
svn commit: r1646853 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
Author: mikemccand
Date: Fri Dec 19 20:10:59 2014
New Revision: 1646853
URL: http://svn.apache.org/r1646853
Log:
LUCENE-6122: always set CMS settings in LuceneTestCase.newIndexWriterConfig
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1646853&r1=1646852&r2=1646853&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Fri Dec 19 20:10:59 2014
@@ -920,7 +920,18 @@ public abstract class LuceneTestCase ext
int maxMergeCount = TestUtil.nextInt(r, maxThreadCount, maxThreadCount + 4);
cms.setMaxMergesAndThreads(maxMergeCount, maxThreadCount);
c.setMergeScheduler(cms);
+ } else {
+ // Always use consistent settings, else CMS's dynamic (SSD or not)
+ // defaults can change, hurting reproducibility:
+ ConcurrentMergeScheduler cms = new ConcurrentMergeScheduler();
+
+ // Only 1 thread can run at once (should maybe help reproducibility),
+ // with up to 3 pending merges before segment-producing threads are
+ // stalled:
+ cms.setMaxMergesAndThreads(3, 1);
+ c.setMergeScheduler(cms);
}
+
if (r.nextBoolean()) {
if (rarely(r)) {
// crazy value