File tree Expand file tree Collapse file tree 2 files changed +1
-4
lines changed
server/src/internalClusterTest/java/org/elasticsearch/index/engine Expand file tree Collapse file tree 2 files changed +1
-4
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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 ();
You can’t perform that action at this time.
0 commit comments