Apache Lucene open-source search software
TestIndexWriterOnVMError.testUnknownError times out (fixes potential IW deadlock on tragic exceptions). (#12751)
Dawid Weissc85529b2c0bd
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 8fbde7a4616..bbab68f172c 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -273,6 +273,9 @@ Changes in runtime behaviorBug Fixes---------------------+* GITHUB#12654: TestIndexWriterOnVMError.testUnknownError times out (fixes potential IndexWriter+ deadlock with tragic exceptions). (Benjamin Trent, Dawid Weiss, Simon Willnauer)+* GITHUB#12614: Make LRUQueryCache respect Accountable queries on eviction and consistency check(Grigoriy Troitskiy)diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.javaindex 4e235ae7d8e..209eca938bc 100644--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java@@ -2464,6 +2464,17 @@ public class IndexWriterinfoStream.message("IW", "rollback");}+ Closeable cleanupAndNotify =+ () -> {+ assert Thread.holdsLock(this);+ writeLock = null;+ closed = true;+ closing = false;+ // So any "concurrently closing" threads wake up and see that the close has now+ // completed:+ notifyAll();+ };+try {synchronized (this) {// must be synced otherwise register merge might throw and exception if merges@@ -2532,42 +2543,35 @@ public class IndexWriter// below that sets closed:closed = true;- IOUtils.close(writeLock); // release write lock- writeLock = null;- closed = true;- closing = false;- // So any "concurrently closing" threads wake up and see that the close has now completed:- notifyAll();+ IOUtils.close(writeLock, cleanupAndNotify);}} catch (Throwable throwable) {try {// Must not hold IW's lock while closing// mergeScheduler: this can lead to deadlock,// e.g. TestIW.testThreadInterruptDeadlock- IOUtils.closeWhileHandlingException(mergeScheduler);- synchronized (this) {- // we tried to be nice about it: do the minimum- // don't leak a segments_N file if there is a pending commit- if (pendingCommit != null) {- try {- pendingCommit.rollbackCommit(directory);- deleter.decRef(pendingCommit);- } catch (Throwable t) {- throwable.addSuppressed(t);- }- pendingCommit = null;- }-- // close all the closeables we can (but important is readerPool and writeLock to prevent- // leaks)- IOUtils.closeWhileHandlingException(readerPool, deleter, writeLock);- writeLock = null;- closed = true;- closing = false;+ IOUtils.closeWhileHandlingException(+ mergeScheduler,+ () -> {+ synchronized (this) {+ // we tried to be nice about it: do the minimum+ // don't leak a segments_N file if there is a pending commit+ if (pendingCommit != null) {+ try {+ pendingCommit.rollbackCommit(directory);+ deleter.decRef(pendingCommit);+ } catch (Throwable t) {+ throwable.addSuppressed(t);+ }+ pendingCommit = null;+ }- // So any "concurrently closing" threads wake up and see that the close has now completed:- notifyAll();- }+ // close all the closeables we can (but important is readerPool and writeLock to+ // prevent leaks)+ IOUtils.closeWhileHandlingException(+ readerPool, deleter, writeLock, cleanupAndNotify);+ }+ });} catch (Throwable t) {throwable.addSuppressed(t);} finally {