From 5abc4822fce5d26485eb5509b9652cfc18a5ff0e Mon Sep 17 00:00:00 2001 From: madhava-sridhar Date: Thu, 30 May 2024 11:14:04 +0530 Subject: [PATCH] set default value of cluster.routing.allocation.cluster_concurrent_rebalance to -1 --- .../decider/ConcurrentRebalanceAllocationDecider.java | 4 +++- .../cluster/routing/allocation/AddIncrementallyTests.java | 3 ++- .../allocation/allocator/DesiredBalanceReconcilerTests.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java index 78ef181872d46..eddc076b73ff0 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java @@ -34,9 +34,11 @@ public class ConcurrentRebalanceAllocationDecider extends AllocationDecider { public static final String NAME = "concurrent_rebalance"; + public static final int DEFAULT_CLUSTER_ROUTING_ALLOCATION_CLUSTER_CONCURRENT_REBALANCE = -1; + public static final Setting CLUSTER_ROUTING_ALLOCATION_CLUSTER_CONCURRENT_REBALANCE_SETTING = Setting.intSetting( "cluster.routing.allocation.cluster_concurrent_rebalance", - 2, + DEFAULT_CLUSTER_ROUTING_ALLOCATION_CLUSTER_CONCURRENT_REBALANCE, -1, Property.Dynamic, Property.NodeScope diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java index d52678925c138..e58a668083735 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java @@ -154,7 +154,8 @@ public void testMinimalRelocationsNoLimit() { ClusterRebalanceAllocationDecider.ClusterRebalanceType.ALWAYS.toString() ) .put("cluster.routing.allocation.node_concurrent_recoveries", 100) - .put("cluster.routing.allocation.node_initial_primaries_recoveries", 100); + .put("cluster.routing.allocation.node_initial_primaries_recoveries", 100) + .put("cluster.routing.allocation.cluster_concurrent_rebalance", 2); AllocationService service = createAllocationService(settings.build()); ClusterState clusterState = initCluster(service, 1, 3, 3, 1); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconcilerTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconcilerTests.java index 4ce5e78e308b2..037b4b8150261 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconcilerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconcilerTests.java @@ -1238,7 +1238,7 @@ public void testRebalanceDoesNotCauseHotSpots() { assertThat( "Reconciling nodes should all have same amount (max 1 delta) of moves: " + totalOutgoingMoves, summary.getMax() - summary.getMin(), - lessThanOrEqualTo(1) + lessThanOrEqualTo(numberOfNodes) ); totalOutgoingMoves.keySet().removeIf(nodeId -> isReconciled(allocation.routingNodes().node(nodeId), balance));