Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

LUCENE-9508: Fix DocumentsWriter to block threads until unstalled (#2085)

Simon Willnauerc71f119e9ac0
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 1335f8f4681..c31ee6bce64 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -250,6 +250,11 @@ Optimizations
Bug Fixes
---------------------
+* LUCENE-9508: DocumentsWriter was only stalling threads for 1 second allowing
+ documents to be indexed even the DocumentsWriter wasn't able to keep up flushing.
+ Unless IW can't make progress due to an ill behaving DWPT this issue was barely
+ noticeable. (Simon Willnauer)
+
* LUCENE-9581: Japanese tokenizer should discard the compound token instead of disabling the decomposition
of long tokens when discardCompoundToken is activated. (Jim Ferenczi)
diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
index 9f01f884b8c..3da9a76b600 100644
--- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
@@ -371,19 +371,15 @@ final class DocumentsWriter implements Closeable, Accountable {
private boolean preUpdate() throws IOException {
ensureOpen();
boolean hasEvents = false;
-
- if (flushControl.anyStalledThreads() || (flushControl.numQueuedFlushes() > 0 && config.checkPendingFlushOnUpdate)) {
+ while (flushControl.anyStalledThreads() || (flushControl.numQueuedFlushes() > 0 && config.checkPendingFlushOnUpdate)) {
// Help out flushing any queued DWPTs so we can un-stall:
- do {
- // Try pick up pending threads here if possible
- DocumentsWriterPerThread flushingDWPT;
- while ((flushingDWPT = flushControl.nextPendingFlush()) != null) {
- // Don't push the delete here since the update could fail!
- hasEvents |= doFlush(flushingDWPT);
- }
-
- flushControl.waitIfStalled(); // block if stalled
- } while (flushControl.numQueuedFlushes() != 0); // still queued DWPTs try help flushing
+ // Try pick up pending threads here if possible
+ DocumentsWriterPerThread flushingDWPT;
+ while ((flushingDWPT = flushControl.nextPendingFlush()) != null) {
+ // Don't push the delete here since the update could fail!
+ hasEvents |= doFlush(flushingDWPT);
+ }
+ flushControl.waitIfStalled(); // block if stalled
}
return hasEvents;
}
diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
index 30a9277d16d..99d2748917d 100644
--- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
+++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java
@@ -103,6 +103,10 @@ final class DocumentsWriterStallControl {
synchronized boolean hasBlocked() { // for tests
return numWaiting > 0;
}
+
+ synchronized int getNumWaiting() { // for tests
+ return numWaiting;
+ }
boolean isHealthy() { // for tests
return !stalled; // volatile read!
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
index cc80e193b44..1fa915e6aad 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -4258,4 +4258,47 @@ public class TestIndexWriter extends LuceneTestCase {
}
}
}
+
+ public void testIndexWriterBlocksOnStall() throws IOException, InterruptedException {
+ try (Directory dir = newDirectory()) {
+ try (IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig())) {
+ DocumentsWriterStallControl stallControl = writer.getDocsWriter().flushControl.stallControl;
+ stallControl.updateStalled(true);
+ Thread[] threads = new Thread[random().nextInt(3)+1];
+ AtomicLong numThreadsCompleted = new AtomicLong(0);
+ for (int i = 0; i < threads.length; i++) {
+ threads[i] = new Thread(() -> {
+ Document d = new Document();
+ d.add(new StringField("id", Integer.toString(0), Field.Store.YES));
+ try {
+ writer.addDocument(d);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ numThreadsCompleted.incrementAndGet();
+ });
+ threads[i].start();
+ }
+ try {
+ for (int i = 0; i < 10; i++) {
+ synchronized (stallControl) {
+ stallControl.notifyAll();
+ }
+ while (stallControl.getNumWaiting() != threads.length) {
+ // wait for all threads to be stalled again
+ assertEquals(0, writer.getPendingNumDocs());
+ assertEquals(0, numThreadsCompleted.get());
+ }
+ }
+ } finally {
+ stallControl.updateStalled(false);
+ for (Thread t : threads) {
+ t.join();
+ }
+ }
+ writer.commit();
+ assertEquals(threads.length, writer.getDocStats().maxDoc);
+ }
+ }
+ }
}