Skip to content

Commit 2d16a97

Browse files
Decrease merge task checker periodicity in tests (#130082) (#130119)
Decreases the periodicity (from 5s to 100ms), for some tests, with which merge tasks are checked if there's sufficient available disk space to execute or if they've been aborted since enqueued for execution. Fixes #130044
1 parent ddbc2b5 commit 2d16a97

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/AutoscalingStorageIntegTestCase.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDecider;
1616
import org.elasticsearch.common.settings.Settings;
1717
import org.elasticsearch.datastreams.DataStreamsPlugin;
18+
import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;
1819
import org.elasticsearch.plugins.Plugin;
1920
import org.elasticsearch.xpack.autoscaling.LocalStateAutoscaling;
2021
import org.elasticsearch.xpack.autoscaling.action.GetAutoscalingCapacityAction;
@@ -41,7 +42,10 @@ protected Settings nodeSettings(final int nodeOrdinal, final Settings otherSetti
4142
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_HIGH_DISK_WATERMARK_SETTING.getKey(), HIGH_WATERMARK_BYTES + "b")
4243
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_FLOOD_STAGE_WATERMARK_SETTING.getKey(), "0b")
4344
.put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING.getKey(), "0ms")
44-
.put(DiskThresholdDecider.ENABLE_FOR_SINGLE_DATA_NODE.getKey(), "true");
45+
.put(DiskThresholdDecider.ENABLE_FOR_SINGLE_DATA_NODE.getKey(), "true")
46+
// the periodicity for the checker for the available disk space as well as the merge tasks' aborting status
47+
// the default of 5 seconds might timeout some tests
48+
.put(ThreadPoolMergeExecutorService.INDICES_MERGE_DISK_CHECK_INTERVAL_SETTING.getKey(), "100ms");
4549
return builder.build();
4650
}
4751

0 commit comments

Comments
 (0)