Skip to content

Commit 4f6b1bd

Browse files
authored
[CI] Fix MergeWithFailureIT (#135447)
Wait for the store to be closed, don't assume it happens immediately. Closes #135443
1 parent 9fe15af commit 4f6b1bd

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
@@ -609,9 +609,6 @@ tests:
609609
- class: org.elasticsearch.gradle.TestClustersPluginFuncTest
610610
method: override jdk usage via ES_JAVA_HOME for known jdk os incompatibilities
611611
issue: https://github.com/elastic/elasticsearch/issues/135413
612-
- class: org.elasticsearch.index.engine.MergeWithFailureIT
613-
method: testFailedMergeDeadlock
614-
issue: https://github.com/elastic/elasticsearch/issues/135443
615612
- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT
616613
method: test {csv-spec:spatial_shapes.ConvertCartesianShapeFromStringParseError}
617614
issue: https://github.com/elastic/elasticsearch/issues/135455

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)