[lucene-solr] branch branch_8x updated: LUCENE-9363: Only assert for no merging segments we merges are disabled

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

simonw pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 9efbbd4  LUCENE-9363: Only assert for no merging segments we merges are disabled
9efbbd4 is described below

commit 9efbbd4142b417e7dadf4bd9794b3b4591a3e7b2
Author: Simon Willnauer <si...@apache.org>
AuthorDate: Fri May 8 06:58:37 2020 +0200

    LUCENE-9363: Only assert for no merging segments we merges are disabled
---
 lucene/core/src/java/org/apache/lucene/index/IndexWriter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
index 80a6764..716288c 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
@@ -2277,6 +2277,7 @@ public class IndexWriter implements Closeable, TwoPhaseCommit, Accountable,
         // changes concurrently, abortMerges is synced as well
         stopMerges = true; // this disables merges forever
         abortMerges();
+        assert mergingSegments.isEmpty() : "we aborted all merges but still have merging segments: " + mergingSegments;
       }
       if (infoStream.isEnabled("IW")) {
         infoStream.message("IW", "rollback: done finish merges");
@@ -2511,8 +2512,6 @@ public class IndexWriter implements Closeable, TwoPhaseCommit, Accountable,
     }
 
     notifyAll();
-    assert 0 == mergingSegments.size();
-
     if (infoStream.isEnabled("IW")) {
       infoStream.message("IW", "all running merges have aborted");
     }