Skip to content

[9.0] Fix TEST ThreadPoolMergeExecutorServiceDiskSpaceTests testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution failing #132268

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 31, 2025
Merged

[9.0] Fix TEST ThreadPoolMergeExecutorServiceDiskSpaceTests testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution failing #132268

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 @@ -232,9 +232,6 @@ tests:
- class: org.elasticsearch.action.admin.cluster.node.tasks.CancellableTasksIT
method: testChildrenTasksCancelledOnTimeout
issue: https://github.com/elastic/elasticsearch/issues/123568
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution
issue: https://github.com/elastic/elasticsearch/issues/130205
- class: org.elasticsearch.packaging.test.DockerTests
method: test050BasicApiTests
issue: https://github.com/elastic/elasticsearch/issues/120911
Expand Down
12 changes: 2 additions & 10 deletions ...est/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,16 +771,8 @@ public void testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution() thro
while (submittedMergesCount > 0 && expectedAvailableBudget.get() > 0L) {
ThreadPoolMergeScheduler.MergeTask mergeTask = mock(ThreadPoolMergeScheduler.MergeTask.class);
when(mergeTask.supportsIOThrottling()).thenReturn(randomBoolean());
doAnswer(mock -> {
Schedule schedule = randomFrom(Schedule.values());
if (schedule == BACKLOG) {
testThreadPool.executor(ThreadPool.Names.GENERIC).execute(() -> {
// re-enqueue backlogged merge task
threadPoolMergeExecutorService.reEnqueueBackloggedMergeTask(mergeTask);
});
}
return schedule;
}).when(mergeTask).schedule();
// avoid backlogging and re-enqueing merge tasks in this test because it makes the queue's available budget unsteady
when(mergeTask.schedule()).thenReturn(randomFrom(RUN, ABORT));
// let some task complete, which will NOT hold up any budget
if (randomBoolean()) {
// this task will NOT hold up any budget because it runs quickly (it is not blocked)
Expand Down