Skip to content

[9.1] Fix flaky ThreadPoolMergeSchedulerStressTestIT (#139819) #140342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elasticsearchmachine merged 1 commit into from
Jan 8, 2026
Merged

[9.1] Fix flaky ThreadPoolMergeSchedulerStressTestIT (#139819) #140342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...ClusterTest/java/org/elasticsearch/index/engine/ThreadPoolMergeSchedulerStressTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ protected Settings nodeSettings() {
.put(ThreadPoolMergeScheduler.USE_THREAD_POOL_MERGE_SCHEDULER_SETTING.getKey(), true)
// when there are more threads than scheduler(s)' concurrency capacity, excess merges will be backlogged
// alternatively, when scheduler(s)' concurrency capacity exceeds the executor's thread count, excess merges will be enqueued
.put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), MERGE_SCHEDULER_MAX_CONCURRENCY + randomFrom(-2, -1, 0, 1, 2))
.put(
EsExecutors.NODE_PROCESSORS_SETTING.getKey(),
Math.min(MERGE_SCHEDULER_MAX_CONCURRENCY + randomFrom(-2, -1, 0, 1, 2), Runtime.getRuntime().availableProcessors())
)
.build();
}

Expand All @@ -87,6 +90,7 @@ class TestInternalEngine extends org.elasticsearch.index.engine.InternalEngine {
super(engineConfig);
}

@Override
protected ElasticsearchMergeScheduler createMergeScheduler(
ShardId shardId,
IndexSettings indexSettings,
Expand Down Expand Up @@ -257,7 +261,7 @@ public void testMergingFallsBehindAndThenCatchesUp() throws Exception {
assertBusy(() -> {
// wait for merges to enqueue or backlog
assertThat(testEnginePlugin.enqueuedMergesSet.size(), greaterThanOrEqualTo(testEnginePlugin.waitMergesEnqueuedCount));
}, 1, TimeUnit.MINUTES);
}, 10, TimeUnit.MINUTES);
// finish up indexing
indexingDone.set(true);
for (Thread indexingThread : indexingThreads) {
Expand All @@ -273,7 +277,7 @@ public void testMergingFallsBehindAndThenCatchesUp() throws Exception {
assertThat(testEnginePlugin.runningMergesSet.size(), is(0));
assertThat(testEnginePlugin.enqueuedMergesSet.size(), is(0));
testEnginePlugin.mergeExecutorServiceReference.get().allDone();
}, 1, TimeUnit.MINUTES);
}, 10, TimeUnit.MINUTES);
// indices stats says that no merge is currently running (meaning merging did catch up)
IndicesStatsResponse indicesStatsResponse = client().admin().indices().prepareStats("index").setMerge(true).get();
long currentMergeCount = indicesStatsResponse.getIndices().get("index").getPrimaries().merge.getCurrent();
Expand Down