Skip to content

Commit 2614b5d

Browse files
Nit
1 parent b09863a commit 2614b5d

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ private ThreadPoolMergeExecutorService(ThreadPool threadPool) {
6565
void submitMergeTask(MergeTask mergeTask) {
6666
assert mergeTask.isRunning() == false;
6767
assert mergeTask.isOnGoingMergeAborted() == false;
68+
// first enqueue the runnable that runs exactly one merge task (the smallest it can find)
6869
if (enqueueMergeTaskExecution() == false) {
6970
// if the threadpool cannot run the merge, just abort it
7071
mergeTask.abortOnGoingMerge();
@@ -73,6 +74,7 @@ void submitMergeTask(MergeTask mergeTask) {
7374
// count enqueued merge tasks that support IO auto throttling, and maybe adjust IO rate for all
7475
maybeUpdateIORateBytesPerSec(submittedIOThrottledMergeTasksCount.incrementAndGet());
7576
}
77+
// then enqueue the merge task proper
7678
enqueueMergeTask(mergeTask);
7779
}
7880
}

0 commit comments

Comments
 (0)