Skip to content

Fix ThreadPoolMergeExecutorServiceDiskSpaceTests testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution #130001

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 5 commits into from
Jun 25, 2025
Merged

Fix ThreadPoolMergeExecutorServiceDiskSpaceTests testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution #130001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62fbc7b
Fix 129148
albertzaharovits Jun 25, 2025
60bc42c
[CI] Auto commit changes from spotless
Jun 25, 2025
88c9d84
Merge branch 'main' into fix-129148-take2
albertzaharovits Jun 25, 2025
1a306c9
Merge branch 'main' into fix-129148-take2
albertzaharovits Jun 25, 2025
4892c16
Merge branch 'main' into fix-129148-take2
albertzaharovits Jun 25, 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 @@ -476,9 +476,6 @@ tests:
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
method: testAvailableDiskSpaceMonitorWhenFileSystemStatErrors
issue: https://github.com/elastic/elasticsearch/issues/129149
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution
issue: https://github.com/elastic/elasticsearch/issues/129148
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
method: test {lookup-join.EnrichLookupStatsBug ASYNC}
issue: https://github.com/elastic/elasticsearch/issues/129228
Expand Down
18 changes: 13 additions & 5 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 @@ -847,6 +847,7 @@ public void testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution() thro
when(mergeTask2.schedule()).thenReturn(RUN);
boolean task1Runs = randomBoolean();
long currentAvailableBudget = expectedAvailableBudget.get();
// the over-budget here can be larger than the total initial available budget
long overBudget = randomLongBetween(currentAvailableBudget + 1L, currentAvailableBudget + 100L);
long underBudget = randomLongBetween(0L, currentAvailableBudget);
if (task1Runs) {
Expand Down Expand Up @@ -882,11 +883,18 @@ public void testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution() thro
// update the expected budget given that one task now finished
expectedAvailableBudget.set(expectedAvailableBudget.get() + completedMergeTask.estimatedRemainingMergeSize());
}
// let the test finish cleanly
assertBusy(() -> {
assertThat(threadPoolMergeExecutorService.getDiskSpaceAvailableForNewMergeTasks(), is(aHasMoreSpace ? 112_500L : 103_000L));
assertThat(threadPoolMergeExecutorService.allDone(), is(true));
});
assertBusy(
() -> assertThat(
threadPoolMergeExecutorService.getDiskSpaceAvailableForNewMergeTasks(),
is(aHasMoreSpace ? 112_500L : 103_000L)
)
);
// let the test finish cleanly (some tasks can be over budget even if all the other tasks finished running)
aFileStore.totalSpace = Long.MAX_VALUE;
bFileStore.totalSpace = Long.MAX_VALUE;
aFileStore.usableSpace = Long.MAX_VALUE;
bFileStore.usableSpace = Long.MAX_VALUE;
assertBusy(() -> assertThat(threadPoolMergeExecutorService.allDone(), is(true)));
}
if (setThreadPoolMergeSchedulerSetting) {
assertWarnings(
Expand Down