Skip to content

Commit a0e61e0

Browse files
randomize testing to select ENABLED or LOW_THRESHOLD_ONLY
1 parent fc934dc commit a0e61e0

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,9 @@ public void testClusterInfoIncludesNodeUsageStatsForThreadPools() {
344344
var settings = Settings.builder()
345345
.put(
346346
WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_ENABLED_SETTING.getKey(),
347-
WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
347+
randomBoolean()
348+
? WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
349+
: WriteLoadConstraintSettings.WriteLoadDeciderStatus.LOW_THRESHOLD_ONLY
348350
)
349351
.build();
350352
var masterName = internalCluster().startMasterOnlyNode(settings);

server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,9 @@ public void testNodeWriteLoadsArePresent() {
319319
Settings.builder()
320320
.put(
321321
WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_ENABLED_SETTING.getKey(),
322-
WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
322+
randomBoolean()
323+
? WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
324+
: WriteLoadConstraintSettings.WriteLoadDeciderStatus.LOW_THRESHOLD_ONLY
323325
)
324326
.build()
325327
);
@@ -376,7 +378,9 @@ public void testShardWriteLoadsArePresent() {
376378
Settings.builder()
377379
.put(
378380
WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_ENABLED_SETTING.getKey(),
379-
WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
381+
randomBoolean()
382+
? WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
383+
: WriteLoadConstraintSettings.WriteLoadDeciderStatus.LOW_THRESHOLD_ONLY
380384
)
381385
.build()
382386
);

server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ public void testScheduling() {
6262
.put(InternalClusterInfoService.CLUSTER_ROUTING_ALLOCATION_ESTIMATED_HEAP_THRESHOLD_DECIDER_ENABLED.getKey(), true)
6363
.put(
6464
WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_ENABLED_SETTING.getKey(),
65-
WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
65+
randomBoolean()
66+
? WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
67+
: WriteLoadConstraintSettings.WriteLoadDeciderStatus.LOW_THRESHOLD_ONLY
6668
);
6769
if (randomBoolean()) {
6870
settingsBuilder.put(INTERNAL_CLUSTER_INFO_UPDATE_INTERVAL_SETTING.getKey(), randomIntBetween(10000, 60000) + "ms");

server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/WriteLoadConstraintDeciderTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void testWriteLoadDecider() {
4444
*/
4545

4646
ClusterState clusterState = ClusterStateCreationUtils.stateWithAssignedPrimariesAndReplicas(new String[] { indexName }, 3, 1);
47-
// The number of data nodes the util method above creates is numberOfReplicas+1.
47+
// The number of data nodes the util method above creates is numberOfReplicas+1, and three data nodes are needed for this test.
4848
assertEquals(3, clusterState.nodes().size());
4949
assertEquals(1, clusterState.metadata().getTotalNumberOfIndices());
5050

@@ -176,7 +176,9 @@ public void testWriteLoadDecider() {
176176
Settings.builder()
177177
.put(
178178
WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_ENABLED_SETTING.getKey(),
179-
WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
179+
randomBoolean()
180+
? WriteLoadConstraintSettings.WriteLoadDeciderStatus.ENABLED
181+
: WriteLoadConstraintSettings.WriteLoadDeciderStatus.LOW_THRESHOLD_ONLY
180182
)
181183
.build()
182184
);

0 commit comments

Comments
 (0)