Skip to content

[CI] [9.0] Fix ThreadPoolMergeExecutorServiceDiskSpaceTests testAbortingOrRunningMergeTaskHoldsUpBudget #130002

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
Jun 25, 2025
Merged

[CI] [9.0] Fix ThreadPoolMergeExecutorServiceDiskSpaceTests testAbortingOrRunningMergeTaskHoldsUpBudget #130002

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
11 changes: 7 additions & 4 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 @@ -534,7 +534,7 @@ public void testAbortingOrRunningMergeTaskHoldsUpBudget() throws Exception {
aFileStore.totalSpace = randomLongBetween(1_000L, 10_000L);
bFileStore.totalSpace = randomLongBetween(1_000L, 10_000L);
aFileStore.usableSpace = randomLongBetween(900L, aFileStore.totalSpace);
bFileStore.usableSpace = randomLongBetween(900L, bFileStore.totalSpace);
bFileStore.usableSpace = randomValueOtherThan(aFileStore.usableSpace, () -> randomLongBetween(900L, bFileStore.totalSpace));
boolean aHasMoreSpace = aFileStore.usableSpace > bFileStore.usableSpace;
try (
ThreadPoolMergeExecutorService threadPoolMergeExecutorService = ThreadPoolMergeExecutorService
Expand Down Expand Up @@ -613,7 +613,7 @@ public void testBackloggedMergeTasksDoNotHoldUpBudget() throws Exception {
aFileStore.totalSpace = randomLongBetween(1_000L, 10_000L);
bFileStore.totalSpace = randomLongBetween(1_000L, 10_000L);
aFileStore.usableSpace = randomLongBetween(900L, aFileStore.totalSpace);
bFileStore.usableSpace = randomLongBetween(900L, bFileStore.totalSpace);
bFileStore.usableSpace = randomValueOtherThan(aFileStore.usableSpace, () -> randomLongBetween(900L, bFileStore.totalSpace));
boolean aHasMoreSpace = aFileStore.usableSpace > bFileStore.usableSpace;
try (
ThreadPoolMergeExecutorService threadPoolMergeExecutorService = ThreadPoolMergeExecutorService
Expand Down Expand Up @@ -900,7 +900,7 @@ public void testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges() th
long diskSpaceLimitBytes = randomLongBetween(10L, 100L);
aFileStore.usableSpace = diskSpaceLimitBytes + randomLongBetween(1L, 100L);
aFileStore.totalSpace = aFileStore.usableSpace + randomLongBetween(1L, 10L);
bFileStore.usableSpace = diskSpaceLimitBytes + randomLongBetween(1L, 100L);
bFileStore.usableSpace = randomValueOtherThan(aFileStore.usableSpace, () -> diskSpaceLimitBytes + randomLongBetween(1L, 100L));
bFileStore.totalSpace = bFileStore.usableSpace + randomLongBetween(1L, 10L);
boolean aHasMoreSpace = aFileStore.usableSpace > bFileStore.usableSpace;
Settings.Builder settingsBuilder = Settings.builder().put(settings);
Expand Down Expand Up @@ -1001,7 +1001,10 @@ public void testMergeTasksAreUnblockedWhenMoreDiskSpaceBecomesAvailable() throws
bFileStore.totalSpace = randomLongBetween(300L, 1_000L);
long grantedUsableSpaceBuffer = randomLongBetween(10L, 50L);
aFileStore.usableSpace = randomLongBetween(200L, aFileStore.totalSpace - grantedUsableSpaceBuffer);
bFileStore.usableSpace = randomLongBetween(200L, bFileStore.totalSpace - grantedUsableSpaceBuffer);
bFileStore.usableSpace = randomValueOtherThan(
aFileStore.usableSpace,
() -> randomLongBetween(200L, bFileStore.totalSpace - grantedUsableSpaceBuffer)
);
boolean aHasMoreSpace = aFileStore.usableSpace > bFileStore.usableSpace;
Settings.Builder settingsBuilder = Settings.builder().put(settings);
// change the watermark level, just for coverage and it's easier with the calculations
Expand Down