Skip to content

Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging #132496

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
merged 3 commits into from
Aug 13, 2025
Merged

Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging #132496

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
647d771
There must be at least one merge task blocked
albertzaharovits Aug 6, 2025
4e670b4
Merge branch 'main' into fix-131789
albertzaharovits Aug 12, 2025
fbe55dd
Merge branch 'main' into fix-131789
albertzaharovits Aug 13, 2025
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
6 changes: 3 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,9 @@ tests:
- class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS1EnrichUnavailableRemotesIT
method: testEsqlEnrichWithSkipUnavailable
issue: https://github.com/elastic/elasticsearch/issues/132078
- class: org.elasticsearch.index.engine.MergeWithLowDiskSpaceIT
method: testRelocationWhileForceMerging
issue: https://github.com/elastic/elasticsearch/issues/131789
- class: org.elasticsearch.indices.cluster.FieldCapsForceConnectTimeoutIT
method: testTimeoutSetting
issue: https://github.com/elastic/elasticsearch/issues/132179
- class: org.elasticsearch.test.rest.yaml.MDPYamlTestSuiteIT
method: test {yaml=mdp/10_basic/Index using shared data path}
issue: https://github.com/elastic/elasticsearch/issues/132223
Expand Down
6 changes: 4 additions & 2 deletions .../src/internalClusterTest/java/org/elasticsearch/index/engine/MergeWithLowDiskSpaceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ public void testForceMergeIsBlockedThenUnblocked() throws Exception {
indexName,
Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0).put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).build()
);
ensureGreen(indexName);
// get current disk space usage (for all indices on the node)
IndicesStatsResponse stats = indicesAdmin().prepareStats().clear().setStore(true).get();
long usedDiskSpaceAfterIndexing = stats.getTotal().getStore().sizeInBytes();
Expand Down Expand Up @@ -286,6 +287,7 @@ public void testRelocationWhileForceMerging() throws Exception {
indexName,
Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0).put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).build()
);
ensureGreen(indexName);
// get current disk space usage (for all indices on the node)
IndicesStatsResponse stats = indicesAdmin().prepareStats().clear().setStore(true).get();
long usedDiskSpaceAfterIndexing = stats.getTotal().getStore().sizeInBytes();
Expand Down Expand Up @@ -320,8 +322,8 @@ public void testRelocationWhileForceMerging() throws Exception {
.getThreadPoolMergeExecutorService();
TestTelemetryPlugin testTelemetryPlugin = getTelemetryPlugin(node1);
assertBusy(() -> {
// merge executor says merging is blocked due to insufficient disk space while there is a single merge task enqueued
assertThat(threadPoolMergeExecutorService.getMergeTasksQueueLength(), equalTo(1));
// merge executor says merging is blocked due to insufficient disk space
assertThat(threadPoolMergeExecutorService.getMergeTasksQueueLength(), greaterThan(0));
assertTrue(threadPoolMergeExecutorService.isMergingBlockedDueToInsufficientDiskSpace());
// telemetry says that there are indeed some segments enqueued to be merged
testTelemetryPlugin.collect();
Expand Down