@@ -40,9 +40,14 @@ public class ThreadPoolMergeSchedulerTests extends ESTestCase {
4040 public void setUpThreadPool () {
4141 deterministicTaskQueue = new DeterministicTaskQueue ();
4242 testThreadPool = deterministicTaskQueue .getThreadPool ();
43- settingsWithMergeScheduler = Settings .builder ().put (ThreadPoolMergeScheduler .USE_THREAD_POOL_MERGE_SCHEDULER_SETTING .getKey (), true ).build ();
43+ settingsWithMergeScheduler = Settings .builder ()
44+ .put (ThreadPoolMergeScheduler .USE_THREAD_POOL_MERGE_SCHEDULER_SETTING .getKey (), true )
45+ .build ();
4446 indexSettings = IndexSettingsModule .newIndexSettings ("index" , settingsWithMergeScheduler );
45- threadPoolMergeExecutorService = ThreadPoolMergeExecutorService .maybeCreateThreadPoolMergeExecutorService (testThreadPool , settingsWithMergeScheduler );
47+ threadPoolMergeExecutorService = ThreadPoolMergeExecutorService .maybeCreateThreadPoolMergeExecutorService (
48+ testThreadPool ,
49+ settingsWithMergeScheduler
50+ );
4651 }
4752
4853 public void testAutoIOThrottleForMergeTasksWhenSchedulerDisablesIt () throws Exception {
@@ -55,13 +60,19 @@ public void testAutoIOThrottleForMergeTasksWhenSchedulerDisablesIt() throws Exce
5560 ThreadPoolMergeExecutorService threadPoolMergeExecutorService = mock (ThreadPoolMergeExecutorService .class );
5661 MergePolicy .OneMergeProgress oneMergeProgress = new MergePolicy .OneMergeProgress ();
5762 MergePolicy .OneMerge oneMerge = mock (MergePolicy .OneMerge .class );
58- when (oneMerge .getStoreMergeInfo ()).thenReturn (new MergeInfo (randomNonNegativeInt (), randomNonNegativeLong (), randomBoolean (),
59- randomFrom (-1 , randomNonNegativeInt ())));
63+ when (oneMerge .getStoreMergeInfo ()).thenReturn (
64+ new MergeInfo (randomNonNegativeInt (), randomNonNegativeLong (), randomBoolean (), randomFrom (-1 , randomNonNegativeInt ()))
65+ );
6066 when (oneMerge .getMergeProgress ()).thenReturn (oneMergeProgress );
6167 MergeScheduler .MergeSource mergeSource = mock (MergeScheduler .MergeSource .class );
6268 when (mergeSource .getNextMerge ()).thenReturn (oneMerge );
63- try (ThreadPoolMergeScheduler threadPoolMergeScheduler = new ThreadPoolMergeScheduler (new ShardId ("index" , "_na_" , 1 ),
64- indexSettings , threadPoolMergeExecutorService )) {
69+ try (
70+ ThreadPoolMergeScheduler threadPoolMergeScheduler = new ThreadPoolMergeScheduler (
71+ new ShardId ("index" , "_na_" , 1 ),
72+ indexSettings ,
73+ threadPoolMergeExecutorService
74+ )
75+ ) {
6576 threadPoolMergeScheduler .merge (mergeSource , randomFrom (MergeTrigger .values ()));
6677 var submittedMergeTaskCaptor = ArgumentCaptor .forClass (ThreadPoolMergeScheduler .MergeTask .class );
6778 verify (threadPoolMergeExecutorService ).submitMergeTask (submittedMergeTaskCaptor .capture ());
@@ -91,8 +102,13 @@ public void testAutoIOThrottleForMergeTasks() throws Exception {
91102 MergeScheduler .MergeSource mergeSource = mock (MergeScheduler .MergeSource .class );
92103 when (mergeSource .getNextMerge ()).thenReturn (oneMerge );
93104 ThreadPoolMergeExecutorService threadPoolMergeExecutorService = mock (ThreadPoolMergeExecutorService .class );
94- try (ThreadPoolMergeScheduler threadPoolMergeScheduler = new ThreadPoolMergeScheduler (new ShardId ("index" , "_na_" , 1 ),
95- indexSettings , threadPoolMergeExecutorService )) {
105+ try (
106+ ThreadPoolMergeScheduler threadPoolMergeScheduler = new ThreadPoolMergeScheduler (
107+ new ShardId ("index" , "_na_" , 1 ),
108+ indexSettings ,
109+ threadPoolMergeExecutorService
110+ )
111+ ) {
96112 threadPoolMergeScheduler .merge (mergeSource , randomFrom (MergeTrigger .values ()));
97113 var submittedMergeTaskCaptor = ArgumentCaptor .forClass (ThreadPoolMergeScheduler .MergeTask .class );
98114 verify (threadPoolMergeExecutorService ).submitMergeTask (submittedMergeTaskCaptor .capture ());
@@ -102,8 +118,13 @@ public void testAutoIOThrottleForMergeTasks() throws Exception {
102118 // NOT a forced merge
103119 when (oneMerge .getStoreMergeInfo ()).thenReturn (new MergeInfo (randomNonNegativeInt (), randomNonNegativeLong (), randomBoolean (), -1 ));
104120 threadPoolMergeExecutorService = mock (ThreadPoolMergeExecutorService .class );
105- try (ThreadPoolMergeScheduler threadPoolMergeScheduler = new ThreadPoolMergeScheduler (new ShardId ("index" , "_na_" , 1 ),
106- indexSettings , threadPoolMergeExecutorService )) {
121+ try (
122+ ThreadPoolMergeScheduler threadPoolMergeScheduler = new ThreadPoolMergeScheduler (
123+ new ShardId ("index" , "_na_" , 1 ),
124+ indexSettings ,
125+ threadPoolMergeExecutorService
126+ )
127+ ) {
107128 // merge submitted upon closing
108129 threadPoolMergeScheduler .merge (mergeSource , MergeTrigger .CLOSING );
109130 var submittedMergeTaskCaptor = ArgumentCaptor .forClass (ThreadPoolMergeScheduler .MergeTask .class );
@@ -113,8 +134,13 @@ public void testAutoIOThrottleForMergeTasks() throws Exception {
113134 }
114135 // otherwise, merge tasks should be auto IO throttled
115136 threadPoolMergeExecutorService = mock (ThreadPoolMergeExecutorService .class );
116- try (ThreadPoolMergeScheduler threadPoolMergeScheduler = new ThreadPoolMergeScheduler (new ShardId ("index" , "_na_" , 1 ),
117- indexSettings , threadPoolMergeExecutorService )) {
137+ try (
138+ ThreadPoolMergeScheduler threadPoolMergeScheduler = new ThreadPoolMergeScheduler (
139+ new ShardId ("index" , "_na_" , 1 ),
140+ indexSettings ,
141+ threadPoolMergeExecutorService
142+ )
143+ ) {
118144 // merge submitted upon closing
119145 threadPoolMergeScheduler .merge (
120146 mergeSource ,
0 commit comments