From efb5f3e302dbc21fd797ffb45345b6d749242a23 Mon Sep 17 00:00:00 2001
From: tlrx <tlrx.dev@gmail.com>
Date: Thu, 25 Sep 2025 17:06:18 +0200
Subject: [PATCH] [CI] Fix MergeWithFailureIT

Wait for the store to be closed, don't assume
it happens immediately.

Closes #135443
---
 muted-tests.yml                                                | 3 ---
 .../org/elasticsearch/index/engine/MergeWithFailureIT.java     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index 6d75692ab99fb..ead956d0937fa 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -660,9 +660,6 @@ tests:
 - class: org.elasticsearch.gradle.TestClustersPluginFuncTest
   method: override jdk usage via ES_JAVA_HOME for known jdk os incompatibilities
   issue: https://github.com/elastic/elasticsearch/issues/135413
-- class: org.elasticsearch.index.engine.MergeWithFailureIT
-  method: testFailedMergeDeadlock
-  issue: https://github.com/elastic/elasticsearch/issues/135443
 
 # Examples:
 #
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java
index e72b9a2fec2e9..f801b68e48603 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java
@@ -321,7 +321,7 @@ public void testFailedMergeDeadlock() throws Exception {
         ensureRed(indexName);
 
         // verify that the shard store is effectively closed
-        assertTrue(plugin.shardStoreClosedListener.isDone());
+        safeGet(plugin.shardStoreClosedListener);
 
         if (closingThread != null) {
             closingThread.join();