Skip to content

Commit 8ad122f

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent c74d9e8 commit 8ad122f

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

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

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2829,8 +2829,7 @@ LiveIndexWriterConfig getCurrentIndexWriterConfig() {
28292829
}
28302830

28312831
private void maybeFlushAfterMerge(OnGoingMerge merge) {
2832-
if (indexWriter.hasPendingMerges() == false
2833-
&& System.nanoTime() - lastWriteNanos >= engineConfig.getFlushMergesAfter().nanos()) {
2832+
if (indexWriter.hasPendingMerges() == false && System.nanoTime() - lastWriteNanos >= engineConfig.getFlushMergesAfter().nanos()) {
28342833
// NEVER do this on a merge thread since we acquire some locks blocking here and if we concurrently rollback the
28352834
// writer
28362835
// we deadlock on engine#close for instance.
@@ -2877,31 +2876,23 @@ private final class EngineThreadPoolMergeScheduler extends ThreadPoolMergeSchedu
28772876
}
28782877

28792878
@Override
2880-
protected synchronized void enableIndexingThrottling(
2881-
int numRunningMerges,
2882-
int numQueuedMerges,
2883-
int configuredMaxMergeCount
2884-
) {
2879+
protected synchronized void enableIndexingThrottling(int numRunningMerges, int numQueuedMerges, int configuredMaxMergeCount) {
28852880
logger.info(
2886-
"now throttling indexing: numRunningMerges={}, numQueuedMerges={}, maxNumMergesConfigured={}",
2887-
numRunningMerges,
2888-
numQueuedMerges,
2889-
configuredMaxMergeCount
2881+
"now throttling indexing: numRunningMerges={}, numQueuedMerges={}, maxNumMergesConfigured={}",
2882+
numRunningMerges,
2883+
numQueuedMerges,
2884+
configuredMaxMergeCount
28902885
);
28912886
InternalEngine.this.activateThrottling();
28922887
}
28932888

28942889
@Override
2895-
protected synchronized void disableIndexingThrottling(
2896-
int numRunningMerges,
2897-
int numQueuedMerges,
2898-
int configuredMaxMergeCount
2899-
) {
2890+
protected synchronized void disableIndexingThrottling(int numRunningMerges, int numQueuedMerges, int configuredMaxMergeCount) {
29002891
logger.info(
2901-
"stop throttling indexing: numRunningMerges={}, numQueuedMerges={}, maxNumMergesConfigured={}",
2902-
numRunningMerges,
2903-
numQueuedMerges,
2904-
configuredMaxMergeCount
2892+
"stop throttling indexing: numRunningMerges={}, numQueuedMerges={}, maxNumMergesConfigured={}",
2893+
numRunningMerges,
2894+
numQueuedMerges,
2895+
configuredMaxMergeCount
29052896
);
29062897
InternalEngine.this.deactivateThrottling();
29072898
}

0 commit comments

Comments
 (0)