Skip to content

Commit f4d9595

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 68db209 commit f4d9595

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

server/src/main/java/org/elasticsearch/index/IndexService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.elasticsearch.index.engine.Engine;
5151
import org.elasticsearch.index.engine.EngineFactory;
5252
import org.elasticsearch.index.engine.ThreadPoolMergeExecutor;
53-
import org.elasticsearch.index.engine.ThreadPoolMergeScheduler;
5453
import org.elasticsearch.index.fielddata.FieldDataContext;
5554
import org.elasticsearch.index.fielddata.IndexFieldData;
5655
import org.elasticsearch.index.fielddata.IndexFieldDataCache;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,11 @@ public InternalEngine(EngineConfig engineConfig) {
253253
boolean success = false;
254254
try {
255255
this.lastDeleteVersionPruneTimeMSec = engineConfig.getThreadPool().relativeTimeInMillis();
256-
mergeScheduler = createMergeScheduler(engineConfig.getShardId(), engineConfig.getIndexSettings(), engineConfig.getThreadPoolMergeExecutor());
256+
mergeScheduler = createMergeScheduler(
257+
engineConfig.getShardId(),
258+
engineConfig.getIndexSettings(),
259+
engineConfig.getThreadPoolMergeExecutor()
260+
);
257261
scheduler = mergeScheduler.getMergeScheduler();
258262
throttle = new IndexThrottle();
259263
try {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ public double getTargetMBPerSec() {
6868
return targetMBPerSec;
6969
}
7070

71-
public synchronized void updateMergeScheduler(ThreadPoolMergeScheduler threadPoolMergeScheduler,
72-
Consumer<ThreadPoolMergeScheduler> updater) {
71+
public synchronized void updateMergeScheduler(
72+
ThreadPoolMergeScheduler threadPoolMergeScheduler,
73+
Consumer<ThreadPoolMergeScheduler> updater
74+
) {
7375
registeredMergeSchedulers.remove(threadPoolMergeScheduler);
7476
currentlyExecutingMergesCount -= threadPoolMergeScheduler.getCurrentlyRunningMergeTasks().size();
7577
updater.accept(threadPoolMergeScheduler);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ public MergeScheduler getMergeScheduler() {
8888
@Override
8989
public void refreshConfig() {
9090
// in case max merge count changed
91-
// maybeActivateThrottling();
92-
// maybeDeactivateThrottling();
93-
// // in case max thread count changed (and more merges can be running simultaneously)
94-
// while (maybeExecuteNextMerge()) {}
91+
// maybeActivateThrottling();
92+
// maybeDeactivateThrottling();
93+
// // in case max thread count changed (and more merges can be running simultaneously)
94+
// while (maybeExecuteNextMerge()) {}
9595
// the IO auto-throttled setting change is only honoured for new merges
9696
// (existing ones continue with the value of the setting when the merge created (queued))
9797
}

0 commit comments

Comments
 (0)