Skip to content

Commit e7a21c0

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent d1f47b9 commit e7a21c0

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ public static void installMockUsableSpaceFS() throws Exception {
7777
// some tests hold one merge thread blocked, and need at least one other runnable
7878
mergeExecutorThreadCount = randomIntBetween(2, 8);
7979
Settings.Builder settingsBuilder = Settings.builder()
80-
.put(Environment.PATH_HOME_SETTING.getKey(), path)
81-
.putList(Environment.PATH_DATA_SETTING.getKey(), paths)
82-
// the default of "5s" slows down testing
83-
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "50ms")
84-
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount);
80+
.put(Environment.PATH_HOME_SETTING.getKey(), path)
81+
.putList(Environment.PATH_DATA_SETTING.getKey(), paths)
82+
// the default of "5s" slows down testing
83+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "50ms")
84+
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount);
8585
if (randomBoolean()) {
8686
settingsBuilder.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true);
8787
}
@@ -585,15 +585,10 @@ public void testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution() thro
585585
expectedAvailableBudget.set(expectedAvailableBudget.get() + completedMergeTask.estimatedRemainingMergeSize());
586586
}
587587
// let the test finish cleanly
588-
assertBusy(
589-
() -> {
590-
assertThat(
591-
threadPoolMergeExecutorService.getDiskSpaceAvailableForNewMergeTasks(),
592-
is(aHasMoreSpace ? 112_500L : 103_000L)
593-
);
594-
assertThat(threadPoolMergeExecutorService.allDone(), is(true));
595-
}
596-
);
588+
assertBusy(() -> {
589+
assertThat(threadPoolMergeExecutorService.getDiskSpaceAvailableForNewMergeTasks(), is(aHasMoreSpace ? 112_500L : 103_000L));
590+
assertThat(threadPoolMergeExecutorService.allDone(), is(true));
591+
});
597592
}
598593
}
599594
}

0 commit comments

Comments
 (0)