You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2022/07/11 09:37:55 UTC

[lucene] branch branch_9x updated: LUCENE-10647: Fix TestMergeSchedulerExternal failures (#1011)

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

jpountz pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 190cfbc65c6 LUCENE-10647: Fix TestMergeSchedulerExternal failures (#1011)
190cfbc65c6 is described below

commit 190cfbc65c66be807d6c61291500a6fdcf9a975e
Author: Vigya Sharma <vi...@gmail.com>
AuthorDate: Mon Jul 11 02:23:17 2022 -0700

    LUCENE-10647: Fix TestMergeSchedulerExternal failures (#1011)
    
    Ensure mergeScheduler.sync() gets called before we rollback the writer.
---
 .../core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
index 4f1c735dfc9..da72c3273d1 100644
--- a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
+++ b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
@@ -134,7 +134,13 @@ public class TestMergeSchedulerExternal extends LuceneTestCase {
       for (int i = 0; i < 20; i++) {
         writer.addDocument(doc);
       }
+    } catch (
+        @SuppressWarnings("unused")
+        IllegalStateException ise) {
+      // OK
+    }
 
+    try {
       ((MyMergeScheduler) writer.getConfig().getMergeScheduler()).sync();
     } catch (
         @SuppressWarnings("unused")