Skip to content

[CI] Fix MergeWithFailureIT #135447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2025
Merged

[CI] Fix MergeWithFailureIT #135447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efb5f3e
[CI] Fix MergeWithFailureIT
tlrx Sep 25, 2025
844658e
Merge branch 'main' into 2025/09/25/fix-135443
tlrx Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,9 +615,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
- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT
method: test {csv-spec:spatial_shapes.ConvertCartesianShapeFromStringParseError}
issue: https://github.com/elastic/elasticsearch/issues/135455
Expand Down
2 changes: 1 addition & 1 deletion server/src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithFailureIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down