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

LUCENE-8813: Count down latch in finally block. 

This test hangs until it times-out when an assertion is tripped
in the indexing thread. Counting down the latch in a finally block
will cause the test to fail earlier.
This commit is contained in:
Simon Willnauer 2019-05-28 10:55:18 +02:00
parent c252b92caa
commit 171d7f131f
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lucene/core/src/test/org/apache/lucene/index/TestIndexTooManyDocs.java
View File

@ -54,27 +54,30 @@ public class TestIndexTooManyDocs extends LuceneTestCase {
threads[i] = new Thread(() -> {
latch.countDown();
try {
latch.await();
} catch (InterruptedException e) {
throw new AssertionError(e);
}
for (int d = 0; d < 100; d++) {
Document doc = new Document();
String id = Integer.toString(random().nextInt(numMaxDoc * 2));
doc.add(new StringField("id", id, Field.Store.NO));
try {
Term t = new Term("id", id);
if (random().nextInt(5) == 0) {
writer.deleteDocuments(new TermQuery(t));
}
writer.updateDocument(t, doc);
} catch (IOException e) {
latch.await();
} catch (InterruptedException e) {
throw new AssertionError(e);
} catch (IllegalArgumentException e) {
assertEquals("number of documents in the index cannot exceed " + IndexWriter.getActualMaxDocs(), e.getMessage());
}
for (int d = 0; d < 100; d++) {
Document doc = new Document();
String id = Integer.toString(random().nextInt(numMaxDoc * 2));
doc.add(new StringField("id", id, Field.Store.NO));
try {
Term t = new Term("id", id);
if (random().nextInt(5) == 0) {
writer.deleteDocuments(new TermQuery(t));
}
writer.updateDocument(t, doc);
} catch (IOException e) {
throw new AssertionError(e);
} catch (IllegalArgumentException e) {
assertEquals("number of documents in the index cannot exceed " + IndexWriter.getActualMaxDocs(), e.getMessage());
}
}
} finally {
indexingDone.countDown();
}
indexingDone.countDown();
});
} else {
threads[i] = new Thread(() -> {