Skip to content

[CI] [9.0] Fix ThreadPoolMergeSchedulerTests testSchedulerCloseWaitsForRunningMerge #130529

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 1 commit into from
Jul 3, 2025
Merged

[CI] [9.0] Fix ThreadPoolMergeSchedulerTests testSchedulerCloseWaitsForRunningMerge #130529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -273,9 +273,6 @@ tests:
- class: org.elasticsearch.packaging.test.DockerTests
method: test072RunEsAsDifferentUserAndGroup
issue: https://github.com/elastic/elasticsearch/issues/128031
- class: org.elasticsearch.index.engine.ThreadPoolMergeSchedulerTests
method: testSchedulerCloseWaitsForRunningMerge
issue: https://github.com/elastic/elasticsearch/issues/125236
- class: org.elasticsearch.packaging.test.DockerTests
method: test010Install
issue: https://github.com/elastic/elasticsearch/issues/125680
Expand Down
5 changes: 3 additions & 2 deletions server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeSchedulerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,11 +566,12 @@ public void testSchedulerCloseWaitsForRunningMerge() throws Exception {
fail(e);
}
});
// test expects that there definitely is a running merge before closing the merge scheduler
mergeRunningLatch.await();
// closes the merge scheduler
t.start();
try {
assertTrue(t.isAlive());
// wait for the merge to actually run
mergeRunningLatch.await();
// ensure the merge scheduler is effectively "closed"
assertBusy(() -> {
MergeSource mergeSource2 = mock(MergeSource.class);
Expand Down