Skip to content

Commit 9e1215a

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent cd39b81 commit 9e1215a

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.elasticsearch.threadpool.ThreadPool;
1818

1919
import java.util.Comparator;
20-
import java.util.PriorityQueue;
2120
import java.util.Set;
2221
import java.util.concurrent.ExecutorService;
2322
import java.util.concurrent.PriorityBlockingQueue;

server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceTests.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ public void testMergeTasksRunConcurrently() throws Exception {
167167
// at least 2 merges allowed to run concurrently
168168
int mergeExecutorThreadCount = randomIntBetween(2, 5);
169169
Settings settings = Settings.builder()
170-
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
171-
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
172-
.build();
170+
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
171+
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
172+
.build();
173173
try (TestThreadPool testThreadPool = new TestThreadPool("test", settings)) {
174174
ThreadPoolMergeExecutorService threadPoolMergeExecutorService = ThreadPoolMergeExecutorService
175-
.maybeCreateThreadPoolMergeExecutorService(testThreadPool, settings);
175+
.maybeCreateThreadPoolMergeExecutorService(testThreadPool, settings);
176176
assertNotNull(threadPoolMergeExecutorService);
177177
assertThat(threadPoolMergeExecutorService.getMaxConcurrentMerges(), equalTo(mergeExecutorThreadCount));
178178
// more merge tasks than max concurrent merges allowed to run concurrently
@@ -201,21 +201,21 @@ public void testMergeTasksRunConcurrently() throws Exception {
201201
threadPoolMergeExecutorService.submitMergeTask(mergeTask);
202202
}
203203
for (int completedTasksCount = 0; completedTasksCount < totalMergeTasksCount
204-
- mergeExecutorThreadCount; completedTasksCount++) {
204+
- mergeExecutorThreadCount; completedTasksCount++) {
205205
int finalCompletedTasksCount = completedTasksCount;
206206
assertBusy(() -> {
207207
// assert that there are merge tasks running concurrently at the max allowed concurrency rate
208208
assertThat(threadPoolMergeExecutorService.getCurrentlyRunningMergeTasks().size(), is(mergeExecutorThreadCount));
209209
// with the other merge tasks enqueued
210210
assertThat(
211-
threadPoolMergeExecutorService.getQueuedMergeTasks().size(),
212-
is(totalMergeTasksCount - mergeExecutorThreadCount - finalCompletedTasksCount)
211+
threadPoolMergeExecutorService.getQueuedMergeTasks().size(),
212+
is(totalMergeTasksCount - mergeExecutorThreadCount - finalCompletedTasksCount)
213213
);
214214
// also check thread-pool stats for the same
215215
assertThat(threadPoolExecutor.getActiveCount(), is(mergeExecutorThreadCount));
216216
assertThat(
217-
threadPoolExecutor.getQueue().size(),
218-
is(totalMergeTasksCount - mergeExecutorThreadCount - finalCompletedTasksCount)
217+
threadPoolExecutor.getQueue().size(),
218+
is(totalMergeTasksCount - mergeExecutorThreadCount - finalCompletedTasksCount)
219219
);
220220
});
221221
// let one merge task finish running

0 commit comments

Comments
 (0)