Skip to content

Commit efb5f3e

Browse files
committed
[CI] Fix MergeWithFailureIT
Wait for the store to be closed, don't assume it happens immediately. Closes #135443
1 parent f38f4ad commit efb5f3e

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -660,9 +660,6 @@ tests:
660660
- class: org.elasticsearch.gradle.TestClustersPluginFuncTest
661661
method: override jdk usage via ES_JAVA_HOME for known jdk os incompatibilities
662662
issue: https://github.com/elastic/elasticsearch/issues/135413
663-
- class: org.elasticsearch.index.engine.MergeWithFailureIT
664-
method: testFailedMergeDeadlock
665-
issue: https://github.com/elastic/elasticsearch/issues/135443
666663

667664
# Examples:
668665
#

server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ public void testFailedMergeDeadlock() throws Exception {
321321
ensureRed(indexName);
322322

323323
// verify that the shard store is effectively closed
324-
assertTrue(plugin.shardStoreClosedListener.isDone());
324+
safeGet(plugin.shardStoreClosedListener);
325325

326326
if (closingThread != null) {
327327
closingThread.join();

0 commit comments

Comments
 (0)