Skip to content

Commit 75c5a7f

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 4103bf0 commit 75c5a7f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

server/src/internalClusterTest/java/org/elasticsearch/index/engine/ThreadPoolMergeSchedulerStressTestIT.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,14 @@ protected ElasticsearchMergeScheduler createMergeScheduler(
8989
ShardId shardId,
9090
IndexSettings indexSettings,
9191
@Nullable ThreadPoolMergeExecutorService threadPoolMergeExecutorService,
92-
MergeMetrics mergeMetrics) {
92+
MergeMetrics mergeMetrics
93+
) {
9394
ElasticsearchMergeScheduler mergeScheduler = super.createMergeScheduler(
9495
shardId,
9596
indexSettings,
9697
threadPoolMergeExecutorService,
97-
mergeMetrics);
98+
mergeMetrics
99+
);
98100
assertThat(mergeScheduler, instanceOf(ThreadPoolMergeScheduler.class));
99101
// assert there is a single merge executor service for all shards
100102
mergeExecutorServiceReference.compareAndSet(null, threadPoolMergeExecutorService);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2909,7 +2909,8 @@ protected ElasticsearchMergeScheduler createMergeScheduler(
29092909
ShardId shardId,
29102910
IndexSettings indexSettings,
29112911
@Nullable ThreadPoolMergeExecutorService threadPoolMergeExecutorService,
2912-
MergeMetrics mergeMetrics) {
2912+
MergeMetrics mergeMetrics
2913+
) {
29132914
if (threadPoolMergeExecutorService != null) {
29142915
return new EngineThreadPoolMergeScheduler(shardId, indexSettings, threadPoolMergeExecutorService, mergeMetrics);
29152916
} else {
@@ -2922,7 +2923,8 @@ private final class EngineThreadPoolMergeScheduler extends ThreadPoolMergeSchedu
29222923
ShardId shardId,
29232924
IndexSettings indexSettings,
29242925
ThreadPoolMergeExecutorService threadPoolMergeExecutorService,
2925-
MergeMetrics mergeMetrics) {
2926+
MergeMetrics mergeMetrics
2927+
) {
29262928
super(shardId, indexSettings, threadPoolMergeExecutorService, InternalEngine.this::estimateMergeBytes, mergeMetrics);
29272929
}
29282930

0 commit comments

Comments
 (0)