@@ -338,10 +338,10 @@ public void testBackloggedMergeTasksDoNotHoldUpBudget() throws Exception {
338338 bFileStore .usableSpace = randomLongBetween (10L , bFileStore .totalSpace );
339339 boolean aHasMoreSpace = aFileStore .usableSpace > bFileStore .usableSpace ;
340340 Settings settings = Settings .builder ()
341- .put (this .settings )
342- // the default of "5s" slows down testing
343- .put (ThreadPoolMergeExecutorService .INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING .getKey (), "30ms" )
344- .build ();
341+ .put (this .settings )
342+ // the default of "5s" slows down testing
343+ .put (ThreadPoolMergeExecutorService .INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING .getKey (), "30ms" )
344+ .build ();
345345 try (TestThreadPool testThreadPool = new TestThreadPool ("test" , settings )) {
346346 try (NodeEnvironment nodeEnv = new NodeEnvironment (settings , TestEnvironment .newEnvironment (settings ))) {
347347 try (
@@ -408,9 +408,8 @@ && randomBoolean()) {
408408 doAnswer (mock -> {
409409 // maybe re-enqueue backlogged merge task
410410 if (randomBoolean ()) {
411- testThreadPool .executor (ThreadPool .Names .GENERIC ).execute (() -> {
412- threadPoolMergeExecutorService .reEnqueueBackloggedMergeTask (mergeTask );
413- });
411+ testThreadPool .executor (ThreadPool .Names .GENERIC )
412+ .execute (() -> { threadPoolMergeExecutorService .reEnqueueBackloggedMergeTask (mergeTask ); });
414413 }
415414 // always backlog these merge tasks
416415 return BACKLOG ;
@@ -420,22 +419,20 @@ && randomBoolean()) {
420419 }
421420 // assert all backlogging merge tasks have been scheduled and possibly re-enqueued, none run and none aborted,
422421 // AND the available budget is intact
423- assertBusy (
424- () -> {
425- for (ThreadPoolMergeScheduler .MergeTask mergeTask : backloggingMergeTasks ) {
426- verify (mergeTask , atLeastOnce ()).schedule ();
427- }
428- for (ThreadPoolMergeScheduler .MergeTask mergeTask : backloggingMergeTasks ) {
429- verify (mergeTask , times (0 )).run ();
430- verify (mergeTask , times (0 )).abort ();
431- }
432- // budget hasn't changed!
433- assertThat (
434- threadPoolMergeExecutorService .getDiskSpaceAvailableForNewMergeTasks (),
435- is (expectedAvailableBudget .get ())
436- );
422+ assertBusy (() -> {
423+ for (ThreadPoolMergeScheduler .MergeTask mergeTask : backloggingMergeTasks ) {
424+ verify (mergeTask , atLeastOnce ()).schedule ();
437425 }
438- );
426+ for (ThreadPoolMergeScheduler .MergeTask mergeTask : backloggingMergeTasks ) {
427+ verify (mergeTask , times (0 )).run ();
428+ verify (mergeTask , times (0 )).abort ();
429+ }
430+ // budget hasn't changed!
431+ assertThat (
432+ threadPoolMergeExecutorService .getDiskSpaceAvailableForNewMergeTasks (),
433+ is (expectedAvailableBudget .get ())
434+ );
435+ });
439436 // double check that submitting a runnable merge task under budget works correctly
440437 ThreadPoolMergeScheduler .MergeTask mergeTask = mock (ThreadPoolMergeScheduler .MergeTask .class );
441438 long taskBudget = randomLongBetween (1L , backloggedMergeTaskDiskSpaceBudget );
0 commit comments