File tree Expand file tree Collapse file tree 2 files changed +2
-13
lines changed
server/src/test/java/org/elasticsearch/index/engine Expand file tree Collapse file tree 2 files changed +2
-13
lines changed Original file line number Diff line number Diff line change @@ -405,9 +405,6 @@ tests:
405
405
- class : org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
406
406
method : test
407
407
issue : https://github.com/elastic/elasticsearch/issues/130067
408
- - class : org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
409
- method : testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution
410
- issue : https://github.com/elastic/elasticsearch/issues/130205
411
408
- class : org.elasticsearch.search.SearchWithRejectionsIT
412
409
method : testOpenContextsAfterRejections
413
410
issue : https://github.com/elastic/elasticsearch/issues/130821
Original file line number Diff line number Diff line change @@ -771,16 +771,8 @@ public void testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution() thro
771
771
while (submittedMergesCount > 0 && expectedAvailableBudget .get () > 0L ) {
772
772
ThreadPoolMergeScheduler .MergeTask mergeTask = mock (ThreadPoolMergeScheduler .MergeTask .class );
773
773
when (mergeTask .supportsIOThrottling ()).thenReturn (randomBoolean ());
774
- doAnswer (mock -> {
775
- Schedule schedule = randomFrom (Schedule .values ());
776
- if (schedule == BACKLOG ) {
777
- testThreadPool .executor (ThreadPool .Names .GENERIC ).execute (() -> {
778
- // re-enqueue backlogged merge task
779
- threadPoolMergeExecutorService .reEnqueueBackloggedMergeTask (mergeTask );
780
- });
781
- }
782
- return schedule ;
783
- }).when (mergeTask ).schedule ();
774
+ // avoid backlogging and re-enqueing merge tasks in this test because it makes the queue's available budget unsteady
775
+ when (mergeTask .schedule ()).thenReturn (randomFrom (RUN , ABORT ));
784
776
// let some task complete, which will NOT hold up any budget
785
777
if (randomBoolean ()) {
786
778
// this task will NOT hold up any budget because it runs quickly (it is not blocked)
You can’t perform that action at this time.
0 commit comments