Skip to content

Commit bf91cab

Browse files
committed
commit
1 parent cd43ab3 commit bf91cab

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,13 @@ isAutoThrottle && isAutoThrottle(),
236236
);
237237
}
238238

239-
private synchronized void checkMergeTaskThrottling() {
239+
private void checkMergeTaskThrottling() {
240240
long submittedMergesCount = submittedMergeTaskCount.get();
241241
long doneMergesCount = doneMergeTaskCount.get();
242242
int runningMergesCount = runningMergeTasks.size();
243243
int configuredMaxMergeCount = getMaxMergeCount();
244244
// both currently running and enqueued merge tasks are considered "active" for throttling purposes
245245
int activeMerges = (int) (submittedMergesCount - doneMergesCount);
246-
247246
if (activeMerges > configuredMaxMergeCount
248247
// only throttle indexing if disk IO is un-throttled, and we still can't keep up with the merge load
249248
&& threadPoolMergeExecutorService.usingMaxTargetIORateBytesPerSec()

0 commit comments

Comments
 (0)