Skip to content

Commit 0e4bab5

Browse files
albertzaharovitsalbertzaharovits
committed
Disable fs available disk space feature for this test
1 parent 931af36 commit 0e4bab5

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

‎server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceTests.java‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ public void testEnqueuedAndBackloggedMergesAreStillExecutedWhenThreadPoolIsShutd
9797
Settings settings = Settings.builder()
9898
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
9999
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
100+
// disable fs available disk space feature for this test
101+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
100102
.build();
101103
TestThreadPool testThreadPool = new TestThreadPool("test", settings);
102104
nodeEnvironment = newNodeEnvironment(settings);
@@ -213,6 +215,8 @@ public void testTargetIORateChangesWhenSubmittingMergeTasks() throws Exception {
213215
Settings settings = Settings.builder()
214216
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
215217
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
218+
// disable fs available disk space feature for this test
219+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
216220
.build();
217221
nodeEnvironment = newNodeEnvironment(settings);
218222
try (TestThreadPool testThreadPool = new TestThreadPool("test", settings)) {
@@ -298,6 +302,8 @@ public void testIORateIsAdjustedForRunningMergeTasks() throws Exception {
298302
Settings settings = Settings.builder()
299303
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
300304
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
305+
// disable fs available disk space feature for this test
306+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
301307
.build();
302308
nodeEnvironment = newNodeEnvironment(settings);
303309
try (TestThreadPool testThreadPool = new TestThreadPool("test", settings)) {
@@ -396,7 +402,8 @@ private void testIORateAdjustedForSubmittedTasks(int totalTasksToSubmit, int sub
396402
DeterministicTaskQueue mergeExecutorTaskQueue = new DeterministicTaskQueue();
397403
ThreadPool mergeExecutorThreadPool = mergeExecutorTaskQueue.getThreadPool();
398404
Settings settings = Settings.builder()
399-
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0")
405+
// disable fs available disk space feature for this test
406+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
400407
.build();
401408
if (nodeEnvironment != null) {
402409
nodeEnvironment.close();
@@ -465,6 +472,8 @@ public void testMergeTasksRunConcurrently() throws Exception {
465472
Settings settings = Settings.builder()
466473
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
467474
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
475+
// disable fs available disk space feature for this test
476+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
468477
.build();
469478
nodeEnvironment = newNodeEnvironment(settings);
470479
try (TestThreadPool testThreadPool = new TestThreadPool("test", settings)) {
@@ -550,6 +559,8 @@ public void testThreadPoolStatsWithBackloggedMergeTasks() throws Exception {
550559
Settings settings = Settings.builder()
551560
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
552561
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
562+
// disable fs available disk space feature for this test
563+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
553564
.build();
554565
nodeEnvironment = newNodeEnvironment(settings);
555566
try (TestThreadPool testThreadPool = new TestThreadPool("test", settings)) {
@@ -608,6 +619,8 @@ public void testBackloggedMergeTasksExecuteExactlyOnce() throws Exception {
608619
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
609620
// few merge threads, in order to increase contention
610621
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
622+
// disable fs available disk space feature for this test
623+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
611624
.build();
612625
nodeEnvironment = newNodeEnvironment(settings);
613626
try (TestThreadPool testThreadPool = new TestThreadPool("test", settings)) {
@@ -675,7 +688,8 @@ public void testMergeTasksExecuteInSizeOrder() throws IOException {
675688
DeterministicTaskQueue mergeExecutorTaskQueue = new DeterministicTaskQueue();
676689
ThreadPool mergeExecutorThreadPool = mergeExecutorTaskQueue.getThreadPool();
677690
Settings settings = Settings.builder()
678-
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0")
691+
// disable fs available disk space feature for this test
692+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
679693
.build();
680694
nodeEnvironment = newNodeEnvironment(settings);
681695
ThreadPoolMergeExecutorService threadPoolMergeExecutorService = getThreadPoolMergeExecutorService(

‎server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeSchedulerTests.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public void closeNodeEnv() {
6868
public void testMergesExecuteInSizeOrder() throws IOException {
6969
DeterministicTaskQueue threadPoolTaskQueue = new DeterministicTaskQueue();
7070
Settings settings = Settings.builder()
71-
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0")
71+
// disable fs available disk space feature for this test
72+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
7273
.build();
7374
nodeEnvironment = newNodeEnvironment(settings);
7475
ThreadPoolMergeExecutorService threadPoolMergeExecutorService = ThreadPoolMergeExecutorServiceTests
@@ -360,6 +361,8 @@ public void testMergeSourceWithFollowUpMergesRunSequentially() throws Exception
360361
Settings settings = Settings.builder()
361362
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
362363
.put(MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING.getKey(), mergeExecutorThreadCount)
364+
// disable fs available disk space feature for this test
365+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
363366
.build();
364367
nodeEnvironment = newNodeEnvironment(settings);
365368
try (TestThreadPool testThreadPool = new TestThreadPool("test", settings)) {
@@ -434,6 +437,8 @@ public void testMergesRunConcurrently() throws Exception {
434437
Settings settings = Settings.builder()
435438
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
436439
.put(MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING.getKey(), mergeSchedulerMaxThreadCount)
440+
// disable fs available disk space feature for this test
441+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
437442
.build();
438443
nodeEnvironment = newNodeEnvironment(settings);
439444
try (TestThreadPool testThreadPool = new TestThreadPool("test", settings)) {
@@ -521,6 +526,8 @@ public void testSchedulerCloseWaitsForRunningMerge() throws Exception {
521526
Settings settings = Settings.builder()
522527
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), mergeExecutorThreadCount)
523528
.put(MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING.getKey(), mergeSchedulerMaxThreadCount)
529+
// disable fs available disk space feature for this test
530+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "0s")
524531
.build();
525532
nodeEnvironment = newNodeEnvironment(settings);
526533
try (TestThreadPool testThreadPool = new TestThreadPool("test", settings)) {

0 commit comments

Comments
 (0)