Skip to content

[8.19] Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging #132913

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 6 commits into from
Aug 15, 2025
Merged

[8.19] Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging #132913

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80fc3f4
There must be at least one merge task blocked (#132496)
albertzaharovits Aug 13, 2025
c1c33c3
Use consistent terminology for transport version resources/references…
rjernst Aug 14, 2025
fd8984d
Merge branch '8.19' into backport-819-fix-131789
albertzaharovits Aug 14, 2025
7dcceb8
Merge branch '8.19' into backport-819-fix-131789
albertzaharovits Aug 14, 2025
a596f02
Merge branch '8.19' into backport-819-fix-131789
albertzaharovits Aug 14, 2025
738510b
Merge branch '8.19' into backport-819-fix-131789
albertzaharovits Aug 15, 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: 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 @@ -179,6 +179,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 @@ -254,6 +255,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 @@ -287,8 +289,8 @@ public void testRelocationWhileForceMerging() throws Exception {
ThreadPoolMergeExecutorService threadPoolMergeExecutorService = internalCluster().getInstance(IndicesService.class, node1)
.getThreadPoolMergeExecutorService();
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());
// indices stats also says that no merge is currently running (blocked merges are NOT considered as "running")
IndicesStatsResponse indicesStatsResponse = client().admin().indices().prepareStats(indexName).setMerge(true).get();
Expand Down