Skip to content

Fix ReactiveStorageIT testScaleDuringSplitOrClone #130082

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 2 commits into from
Jun 26, 2025
Merged

Fix ReactiveStorageIT testScaleDuringSplitOrClone #130082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
187c804
Decrease merge task checker periodicity in tests
albertzaharovits Jun 26, 2025
bdbb4ee
Merge branch 'main' into fix-130044-take2
albertzaharovits Jun 26, 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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,9 +566,6 @@ tests:
issue: https://github.com/elastic/elasticsearch/issues/130010
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
issue: https://github.com/elastic/elasticsearch/issues/128224
- class: org.elasticsearch.xpack.autoscaling.storage.ReactiveStorageIT
method: testScaleDuringSplitOrClone
issue: https://github.com/elastic/elasticsearch/issues/130044
- class: org.elasticsearch.cluster.metadata.ComposableIndexTemplateTests
method: testMergeEmptyMappingsIntoTemplateWithNonEmptySettings
issue: https://github.com/elastic/elasticsearch/issues/130050
Expand Down
6 changes: 5 additions & 1 deletion ...est/java/org/elasticsearch/xpack/autoscaling/storage/AutoscalingStorageIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.elasticsearch.cluster.routing.allocation.DiskThresholdSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.datastreams.DataStreamsPlugin;
import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.xpack.autoscaling.LocalStateAutoscaling;
import org.elasticsearch.xpack.autoscaling.action.GetAutoscalingCapacityAction;
Expand All @@ -39,7 +40,10 @@ protected Settings nodeSettings(final int nodeOrdinal, final Settings otherSetti
builder.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_LOW_DISK_WATERMARK_SETTING.getKey(), LOW_WATERMARK_BYTES + "b")
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_HIGH_DISK_WATERMARK_SETTING.getKey(), HIGH_WATERMARK_BYTES + "b")
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_FLOOD_STAGE_WATERMARK_SETTING.getKey(), "0b")
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING.getKey(), "0ms");
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING.getKey(), "0ms")
// the periodicity for the checker for the available disk space as well as the merge tasks' aborting status
// the default of 5 seconds might timeout some tests
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "100ms");
return builder.build();
}

Expand Down