Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix deadlock case in test 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1183753 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2011-10-15 22:45:04 +00:00
parent 463db863fb
commit 710b3626c1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
View File

@ -18,16 +18,17 @@ package org.apache.lucene.search;
*/ */
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.List;
import java.util.ArrayList;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase;
@ -63,7 +64,6 @@ public class TestSearcherManager extends ThreadedIndexingAndSearchingTestCase {
@Override @Override
protected void doAfterWriter(ExecutorService es) throws Exception { protected void doAfterWriter(ExecutorService es) throws Exception {
// SearcherManager needs to see empty commit:
final SearcherWarmer warmer = new SearcherWarmer() { final SearcherWarmer warmer = new SearcherWarmer() {
@Override @Override
public void warm(IndexSearcher s) throws IOException { public void warm(IndexSearcher s) throws IOException {
@ -75,6 +75,7 @@ public class TestSearcherManager extends ThreadedIndexingAndSearchingTestCase {
mgr = SearcherManager.open(writer, true, warmer, es); mgr = SearcherManager.open(writer, true, warmer, es);
isNRT = true; isNRT = true;
} else { } else {
// SearcherManager needs to see empty commit:
writer.commit(); writer.commit();
mgr = SearcherManager.open(dir, warmer, es); mgr = SearcherManager.open(dir, warmer, es);
isNRT = false; isNRT = false;
@ -178,8 +179,9 @@ public class TestSearcherManager extends ThreadedIndexingAndSearchingTestCase {
public void testIntermediateClose() throws IOException, InterruptedException { public void testIntermediateClose() throws IOException, InterruptedException {
Directory dir = newDirectory(); Directory dir = newDirectory();
// Test can deadlock if we use SMS:
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random))); TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergeScheduler(new ConcurrentMergeScheduler()));
writer.addDocument(new Document()); writer.addDocument(new Document());
writer.commit(); writer.commit();
final CountDownLatch awaitEnterWarm = new CountDownLatch(1); final CountDownLatch awaitEnterWarm = new CountDownLatch(1);