Skip to content

Commit 63eb905

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 4a9a05a commit 63eb905

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

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

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.elasticsearch.common.settings.ClusterSettings;
1515
import org.elasticsearch.common.settings.Settings;
1616
import org.elasticsearch.common.unit.ByteSizeValue;
17-
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
1817
import org.elasticsearch.common.util.concurrent.EsExecutors;
1918
import org.elasticsearch.core.PathUtils;
2019
import org.elasticsearch.core.PathUtilsForTesting;
@@ -37,20 +36,13 @@
3736
import java.nio.file.attribute.FileStoreAttributeView;
3837
import java.nio.file.spi.FileSystemProvider;
3938
import java.util.LinkedHashSet;
40-
import java.util.Set;
4139
import java.util.concurrent.CountDownLatch;
42-
import java.util.concurrent.Semaphore;
43-
import java.util.concurrent.ThreadPoolExecutor;
4440
import java.util.concurrent.TimeUnit;
45-
import java.util.concurrent.atomic.AtomicInteger;
4641
import java.util.concurrent.atomic.AtomicLong;
4742
import java.util.concurrent.atomic.AtomicReference;
4843

49-
import static org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceTests.getThreadPoolMergeExecutorService;
50-
import static org.elasticsearch.index.engine.ThreadPoolMergeScheduler.Schedule.ABORT;
5144
import static org.elasticsearch.index.engine.ThreadPoolMergeScheduler.Schedule.BACKLOG;
5245
import static org.elasticsearch.index.engine.ThreadPoolMergeScheduler.Schedule.RUN;
53-
import static org.hamcrest.Matchers.equalTo;
5446
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
5547
import static org.hamcrest.Matchers.is;
5648
import static org.mockito.Mockito.doAnswer;
@@ -337,11 +329,11 @@ public void testUnavailableBudgetBlocksEnqueuedMergeTasks() throws Exception {
337329
// fewer merge tasks than pool threads so that there's always a free thread available
338330
int submittedMergesCount = randomIntBetween(1, mergeExecutorThreadCount - 1);
339331
Settings settings = Settings.builder()
340-
.put(this.settings)
341-
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
342-
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
343-
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "100ms")
344-
.build();
332+
.put(this.settings)
333+
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
334+
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
335+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "100ms")
336+
.build();
345337
ClusterSettings clusterSettings = ClusterSettings.createBuiltInClusterSettings(settings);
346338
aFileStore.totalSpace = 150_000L;
347339
bFileStore.totalSpace = 140_000L;
@@ -422,9 +414,7 @@ public void testUnavailableBudgetBlocksEnqueuedMergeTasks() throws Exception {
422414
threadPoolMergeExecutorService.submitMergeTask(mergeTask);
423415
}
424416
// running (or aborting) merge tasks have depleted the available budget
425-
assertBusy(() -> {
426-
assertThat(threadPoolMergeExecutorService.getMergeTasksQueue().getAvailableBudget(), is(0L));
427-
});
417+
assertBusy(() -> { assertThat(threadPoolMergeExecutorService.getMergeTasksQueue().getAvailableBudget(), is(0L)); });
428418
int moreMergeTasksCount = randomIntBetween(1, 10);
429419
// any new merge tasks will only be enqueued but not actually run, until more budget becomes available
430420
for (int i = 0; i < moreMergeTasksCount; i++) {

0 commit comments

Comments
 (0)