Skip to content

Fix ThreadPoolMergeExecutorServiceTests testIORateIsAdjustedForAllRunningMergeTasks #130545

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

Fix ThreadPoolMergeExecutorServiceTests testIORateIsAdjustedForAllRunningMergeTasks #130545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e424ef8
Don't use merge tasks that can backlog
albertzaharovits Jul 3, 2025
80a838d
Revert the backlog stuff
albertzaharovits Jul 3, 2025
8486ba7
[CI] Auto commit changes from spotless
Jul 3, 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 @@ -500,9 +500,6 @@ tests:
- class: org.elasticsearch.xpack.security.PermissionsIT
method: testWhenUserLimitedByOnlyAliasOfIndexCanWriteToIndexWhichWasRolledoverByILMPolicy
issue: https://github.com/elastic/elasticsearch/issues/129481
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceTests
method: testIORateIsAdjustedForAllRunningMergeTasks
issue: https://github.com/elastic/elasticsearch/issues/129531
- class: org.elasticsearch.upgrades.IndexingIT
method: testIndexing
issue: https://github.com/elastic/elasticsearch/issues/129533
Expand Down
14 changes: 1 addition & 13 deletions server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
Expand Down Expand Up @@ -329,7 +328,6 @@ public void testIORateIsAdjustedForAllRunningMergeTasks() throws Exception {
ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) testThreadPool.executor(ThreadPool.Names.MERGE);
Semaphore runMergeSemaphore = new Semaphore(0);
Set<MergeTask> currentlyRunningMergeTasksSet = ConcurrentCollections.newConcurrentSet();
Set<MergeTask> currentlyRunningOrAbortingMergeTasksSet = ConcurrentCollections.newConcurrentSet();
while (mergesStillToComplete > 0) {
if (mergesStillToSubmit > 0 && (currentlyRunningMergeTasksSet.isEmpty() || randomBoolean())) {
MergeTask mergeTask = mock(MergeTask.class);
Expand All @@ -347,27 +345,17 @@ public void testIORateIsAdjustedForAllRunningMergeTasks() throws Exception {
}).when(mergeTask).schedule();
doAnswer(mock -> {
currentlyRunningMergeTasksSet.add(mergeTask);
currentlyRunningOrAbortingMergeTasksSet.add(mergeTask);
// wait to be signalled before completing
runMergeSemaphore.acquire();
currentlyRunningOrAbortingMergeTasksSet.remove(mergeTask);
currentlyRunningMergeTasksSet.remove(mergeTask);
return null;
}).when(mergeTask).run();
doAnswer(mock -> {
currentlyRunningOrAbortingMergeTasksSet.add(mergeTask);
// wait to be signalled before completing
runMergeSemaphore.acquire();
currentlyRunningOrAbortingMergeTasksSet.remove(mergeTask);
return null;
}).when(mergeTask).abort();
assertThat(runMergeSemaphore.availablePermits(), is(0));
boolean isAnyExecutorAvailable = currentlyRunningOrAbortingMergeTasksSet.size() < mergeExecutorThreadCount;
boolean mergeTaskSubmitted = threadPoolMergeExecutorService.submitMergeTask(mergeTask);
assertTrue(mergeTaskSubmitted);
if (isAnyExecutorAvailable) {
assertBusy(() -> assertThat(currentlyRunningOrAbortingMergeTasksSet, hasItem(mergeTask)));
}
assertTrue(threadPoolMergeExecutorService.submitMergeTask(mergeTask));
long latestIORate = threadPoolMergeExecutorService.getTargetIORateBytesPerSec();
// all currently running merge tasks must be IO throttled to the latest IO Rate
assertBusy(() -> {
Expand Down