Skip to content

Start indexing throttling only after disk IO unthrottling does not keep up with the merge load #125654

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 16 commits into from
Mar 30, 2025
Merged

Start indexing throttling only after disk IO unthrottling does not keep up with the merge load #125654

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7e7e624
Only start indexing throttling when disk throttling is lowest
albertzaharovits Mar 26, 2025
5c3ef42
[CI] Auto commit changes from spotless
Mar 26, 2025
54cc5ab
Ooops
albertzaharovits Mar 26, 2025
d1b8193
testIndexingThrottling
albertzaharovits Mar 27, 2025
67fe301
[CI] Auto commit changes from spotless
Mar 27, 2025
774389d
Checkstyle
albertzaharovits Mar 27, 2025
0c8c149
Merge branch 'main' into throttle-only-when-IO-rate-is-high
albertzaharovits Mar 27, 2025
7864c46
TestThreadPoolMergeScheduler
albertzaharovits Mar 28, 2025
948da81
mockThreadPoolMergeExecutorService
albertzaharovits Mar 28, 2025
e381634
testIndexingThrottlingWhileMergesAreRunning
albertzaharovits Mar 28, 2025
f41cb27
isUsingMaxTargetIORate
albertzaharovits Mar 28, 2025
0a91ab6
Merge branch 'main' into throttle-only-when-IO-rate-is-high
albertzaharovits Mar 28, 2025
5472e6a
[CI] Auto commit changes from spotless
Mar 28, 2025
a419917
testIndexingThrottlingWhenSubmittingMerges
albertzaharovits Mar 28, 2025
ea84548
Merge branch 'main' into throttle-only-when-IO-rate-is-high
albertzaharovits Mar 30, 2025
c4cf8b0
Fix IndexStatsIT.testThrottleStats
albertzaharovits Mar 30, 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
4 changes: 4 additions & 0 deletions server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,10 @@ interface UpdateConsumer {
}
}

public boolean usingMaxTargetIORateBytesPerSec() {
return MAX_IO_RATE.getBytes() == targetIORateBytesPerSec.get();
}

// exposed for tests
Set<MergeTask> getRunningMergeTasks() {
return runningMergeTasks;
Expand Down
18 changes: 11 additions & 7 deletions server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,21 +191,25 @@ private void checkMergeTaskThrottling() {
int configuredMaxMergeCount = config.getMaxMergeCount();
// both currently running and enqueued merge tasks are considered "active" for throttling purposes
int activeMerges = (int) (submittedMergesCount - doneMergesCount);
if (activeMerges > configuredMaxMergeCount && shouldThrottleIncomingMerges.get() == false) {
if (activeMerges > configuredMaxMergeCount
&& threadPoolMergeExecutorService.usingMaxTargetIORateBytesPerSec()
&& shouldThrottleIncomingMerges.get() == false) {
// maybe enable merge task throttling
synchronized (shouldThrottleIncomingMerges) {
if (shouldThrottleIncomingMerges.getAndSet(true) == false) {
enableIndexingThrottling(runningMergesCount, activeMerges - runningMergesCount, configuredMaxMergeCount);
}
}
} else if (activeMerges <= configuredMaxMergeCount && shouldThrottleIncomingMerges.get()) {
// maybe disable merge task throttling
synchronized (shouldThrottleIncomingMerges) {
if (shouldThrottleIncomingMerges.getAndSet(false)) {
disableIndexingThrottling(runningMergesCount, activeMerges - runningMergesCount, configuredMaxMergeCount);
} else if (activeMerges <= configuredMaxMergeCount
&& threadPoolMergeExecutorService.usingMaxTargetIORateBytesPerSec() == false
&& shouldThrottleIncomingMerges.get()) {
// maybe disable merge task throttling
synchronized (shouldThrottleIncomingMerges) {
if (shouldThrottleIncomingMerges.getAndSet(false)) {
disableIndexingThrottling(runningMergesCount, activeMerges - runningMergesCount, configuredMaxMergeCount);
}
}
}
}
}

// exposed for tests
Expand Down