|
38 | 38 | import java.util.concurrent.ThreadPoolExecutor; |
39 | 39 | import java.util.concurrent.atomic.AtomicBoolean; |
40 | 40 | import java.util.concurrent.atomic.AtomicInteger; |
41 | | -import java.util.function.BooleanSupplier; |
42 | 41 |
|
43 | 42 | import static org.hamcrest.Matchers.contains; |
44 | 43 | import static org.hamcrest.Matchers.equalTo; |
@@ -194,8 +193,7 @@ public void testIndexingThrottlingWhenSubmittingMerges() { |
194 | 193 | TestThreadPoolMergeScheduler threadPoolMergeScheduler = new TestThreadPoolMergeScheduler( |
195 | 194 | new ShardId("index", "_na_", 1), |
196 | 195 | IndexSettingsModule.newIndexSettings("index", mergeSchedulerSettings), |
197 | | - threadPoolMergeExecutorService, |
198 | | - () -> false |
| 196 | + threadPoolMergeExecutorService |
199 | 197 | ); |
200 | 198 | // make sure there are more merges submitted than the max merge count limit (which triggers IO throttling) |
201 | 199 | int excessMerges = randomIntBetween(1, 10); |
@@ -258,8 +256,7 @@ public void testIndexingThrottlingWhileMergesAreRunning() { |
258 | 256 | TestThreadPoolMergeScheduler threadPoolMergeScheduler = new TestThreadPoolMergeScheduler( |
259 | 257 | new ShardId("index", "_na_", 1), |
260 | 258 | IndexSettingsModule.newIndexSettings("index", mergeSchedulerSettings), |
261 | | - threadPoolMergeExecutorService, |
262 | | - () -> false |
| 259 | + threadPoolMergeExecutorService |
263 | 260 | ); |
264 | 261 | int mergesToRun = randomIntBetween(0, 5); |
265 | 262 | // make sure there are more merges submitted and not run |
@@ -704,8 +701,7 @@ static class TestThreadPoolMergeScheduler extends ThreadPoolMergeScheduler { |
704 | 701 | TestThreadPoolMergeScheduler( |
705 | 702 | ShardId shardId, |
706 | 703 | IndexSettings indexSettings, |
707 | | - ThreadPoolMergeExecutorService threadPoolMergeExecutorService, |
708 | | - BooleanSupplier shouldSkipMerge |
| 704 | + ThreadPoolMergeExecutorService threadPoolMergeExecutorService |
709 | 705 | ) { |
710 | 706 | super(shardId, indexSettings, threadPoolMergeExecutorService, merge -> 0); |
711 | 707 | } |
|
0 commit comments