[CI] Auto commit changes from spotless

Author: elasticsearchmachine

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

@@ -44,6 +44,7 @@ public ExecutorMergeScheduler(ShardId shardId, IndexSettings indexSettings, Exec
         this.mergeTracking = new MergeTracking(logger, () -> Double.POSITIVE_INFINITY);
         this.executorService = executorService;
     }
+
     @Override
     public Set<OnGoingMerge> onGoingMerges() {
         return mergeTracking.onGoingMerges();
@@ -167,17 +168,19 @@ public void doRun() {
                 doMerge(mergeSource, onGoingMerge.getMerge());
                 if (verbose()) {
                     message(
-                            String.format(
-                                    Locale.ROOT,
-                                    "merge task %s merge segment [%s] done estSize=%.1f MB (written=%.1f MB) runTime=%.1fs (stopped=%.1fs, paused=%.1fs) rate=%s",
-                                    getName(),
-                                    getSegmentName(onGoingMerge.getMerge()),
-                                    bytesToMB(onGoingMerge.getMerge().estimatedMergeBytes),
-                                    bytesToMB(rateLimiter.getTotalBytesWritten()),
-                                    nsToSec(System.nanoTime() - startTimeNS),
-                                    nsToSec(rateLimiter.getTotalStoppedNS()),
-                                    nsToSec(rateLimiter.getTotalPausedNS()),
-                                    rateToString(rateLimiter.getMBPerSec())));
+                        String.format(
+                            Locale.ROOT,
+                            "merge task %s merge segment [%s] done estSize=%.1f MB (written=%.1f MB) runTime=%.1fs (stopped=%.1fs, paused=%.1fs) rate=%s",
+                            getName(),
+                            getSegmentName(onGoingMerge.getMerge()),
+                            bytesToMB(onGoingMerge.getMerge().estimatedMergeBytes),
+                            bytesToMB(rateLimiter.getTotalBytesWritten()),
+                            nsToSec(System.nanoTime() - startTimeNS),
+                            nsToSec(rateLimiter.getTotalStoppedNS()),
+                            nsToSec(rateLimiter.getTotalPausedNS()),
+                            rateToString(rateLimiter.getMBPerSec())
+                        )
+                    );
                 }
                 if (verbose()) {
                     message(String.format(Locale.ROOT, "merge task %s end", getName()));

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

@@ -2824,10 +2824,11 @@ LiveIndexWriterConfig getCurrentIndexWriterConfig() {
     }
 
     protected ElasticsearchMergeScheduler createMergeScheduler(ShardId shardId, IndexSettings indexSettings) {
-//        return new EngineMergeScheduler(shardId, indexSettings);
+        // return new EngineMergeScheduler(shardId, indexSettings);
         return new ExecutorMergeScheduler(shardId, indexSettings, engineConfig.getThreadPool().executor(ThreadPool.Names.MERGE)) {
             private final AtomicInteger numMergesInFlight = new AtomicInteger(0);
             private final AtomicBoolean isThrottling = new AtomicBoolean();
+
             @Override
             public synchronized void beforeMerge(OnGoingMerge merge) {
                 int maxNumMerges = getMaxMergeCount();
@@ -2849,7 +2850,7 @@ public synchronized void afterMerge(OnGoingMerge merge) {
                     }
                 }
                 if (indexWriter.hasPendingMerges() == false
-                        && System.nanoTime() - lastWriteNanos >= engineConfig.getFlushMergesAfter().nanos()) {
+                    && System.nanoTime() - lastWriteNanos >= engineConfig.getFlushMergesAfter().nanos()) {
                     // NEVER do this on a merge thread since we acquire some locks blocking here and if we concurrently rollback the writer
                     // we deadlock on engine#close for instance.
                     engineConfig.getThreadPool().executor(ThreadPool.Names.FLUSH).execute(new AbstractRunnable() {