From 3d9ec314d8e73d99b7d5f97e31feb490d58f2de5 Mon Sep 17 00:00:00 2001
From: tlrx <tlrx.dev@gmail.com>
Date: Fri, 26 Sep 2025 11:53:41 +0200
Subject: [PATCH] [9.0] Fix MergeWithFailureIT (#135447)

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

Closes #135443
---
 .../java/org/elasticsearch/index/engine/MergeWithFailureIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a64e3344e11fc..7bfae2e37fa32 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java
@@ -359,7 +359,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();