diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/LocalShardsBalancer.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/LocalShardsBalancer.java index d44a8b42b42af..465c928f329dd 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/LocalShardsBalancer.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/LocalShardsBalancer.java @@ -28,6 +28,7 @@ import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.DiskThresholdDecider; +import org.opensearch.common.Randomness; import org.opensearch.common.collect.Tuple; import org.opensearch.gateway.PriorityComparator; @@ -1011,7 +1012,7 @@ AllocateUnassignedDecision decideAllocateUnassigned(final ShardRouting shard) { if (minNodes.isEmpty()){ minNode = null; } else { - minNode = minNodes.get(new Random().nextInt(minNodes.size())); + minNode = minNodes.get(Randomness.get().nextInt(minNodes.size())); } return AllocateUnassignedDecision.fromDecision(decision, minNode != null ? minNode.getRoutingNode().node() : null, nodeDecisions); } diff --git a/test/framework/src/main/java/org/opensearch/cluster/OpenSearchAllocationTestCase.java b/test/framework/src/main/java/org/opensearch/cluster/OpenSearchAllocationTestCase.java index 571bc8493ad5d..a6ed264da279e 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/OpenSearchAllocationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/cluster/OpenSearchAllocationTestCase.java @@ -348,7 +348,7 @@ private final static String printShardAllocationWithHeader(int[] shardCount) { private final static String printShardAllocationWithHeader(String[] indexNames) { StringBuffer sb = new StringBuffer(); Formatter formatter = new Formatter(sb, Locale.getDefault()); - for( String index: indexNames) { + for (String index : indexNames) { formatter.format("%-20s", index); } formatter.format("\n"); @@ -382,10 +382,12 @@ private static void buildMap(ClusterState inputState) { } } - private static void updateMap(TreeMap ShardCountMapToUpdate, - TreeMap nodeIdToIndexMapToUpdate, - TreeMap nodeIdToIndexReplicaMapToUpdate, - ShardRouting shardRouting) { + private static void updateMap( + TreeMap ShardCountMapToUpdate, + TreeMap nodeIdToIndexMapToUpdate, + TreeMap nodeIdToIndexReplicaMapToUpdate, + ShardRouting shardRouting + ) { int[] shard; shard = shardRouting.assignedToNode() ? ShardCountMapToUpdate.get(shardRouting.currentNodeId()) : unassigned; String indexName = shardRouting.getIndexName(); @@ -406,7 +408,6 @@ private static void updateMap(TreeMap ShardCountMapToUpdate, nodeIdToIndexReplicaMapToUpdate.put(shardRouting.currentNodeId(), newArray); } - // For assigned shards, put back counter if (shardRouting.assignedToNode()) ShardCountMapToUpdate.put(shardRouting.currentNodeId(), shard); }