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 2010/11/25 16:12:30 UTC

svn commit: r1039068 - in /lucene/dev/trunk/lucene/src/test/org/apache/lucene: index/TestIndexWriterReader.java util/_TestUtil.java

Author: mikemccand
Date: Thu Nov 25 15:12:29 2010
New Revision: 1039068

URL: http://svn.apache.org/viewvc?rev=1039068&view=rev
Log:
prevent too many open files in test

Modified:
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1039068&r1=1039067&r2=1039068&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Thu Nov 25 15:12:29 2010
@@ -349,6 +349,9 @@ public class TestIndexWriterReader exten
 
     void close(boolean doWait) throws Throwable {
       didClose = true;
+      if (doWait) {
+        mainWriter.waitForMerges();
+      }
       mainWriter.close(doWait);
     }
 

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java?rev=1039068&r1=1039067&r2=1039068&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/_TestUtil.java Thu Nov 25 15:12:29 2010
@@ -231,5 +231,11 @@ public class _TestUtil {
     // keep number of open files lowish
     LogMergePolicy lmp = (LogMergePolicy) w.getMergePolicy();
     lmp.setMergeFactor(Math.min(5, lmp.getMergeFactor()));
+
+    MergeScheduler ms = w.getConfig().getMergeScheduler();
+    if (ms instanceof ConcurrentMergeScheduler) {
+      ((ConcurrentMergeScheduler) ms).setMaxThreadCount(2);
+      ((ConcurrentMergeScheduler) ms).setMaxMergeCount(3);
+    }
   }
 }