Skip to content

Commit c3d4001

Browse files
Random merge queue in RefreshListenersTests
1 parent 57ad622 commit c3d4001

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.elasticsearch.index.engine.EngineTestCase;
4343
import org.elasticsearch.index.engine.InternalEngine;
4444
import org.elasticsearch.index.engine.ThreadPoolMergeQueue;
45+
import org.elasticsearch.index.engine.ThreadPoolMergeScheduler;
4546
import org.elasticsearch.index.mapper.IdFieldMapper;
4647
import org.elasticsearch.index.mapper.LuceneDocument;
4748
import org.elasticsearch.index.mapper.MapperService;
@@ -99,8 +100,11 @@ public void setupListeners() throws Exception {
99100
maxListeners = randomIntBetween(2, 1000);
100101
// Now setup the InternalEngine which is much more complicated because we aren't mocking anything
101102
threadPool = new TestThreadPool(getTestName());
102-
IndexSettings indexSettings = IndexSettingsModule.newIndexSettings("index", Settings.EMPTY);
103-
threadPoolMergeQueue = ThreadPoolMergeQueue.maybeCreateThreadPoolMergeQueue(threadPool, indexSettings.getNodeSettings());
103+
Settings settings = Settings.builder()
104+
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), randomBoolean())
105+
.build();
106+
IndexSettings indexSettings = IndexSettingsModule.newIndexSettings("index", settings);
107+
threadPoolMergeQueue = ThreadPoolMergeQueue.maybeCreateThreadPoolMergeQueue(threadPool, settings);
104108
listeners = new RefreshListeners(
105109
() -> maxListeners,
106110
() -> engine.refresh("too-many-listeners"),

0 commit comments

Comments
 (0)