Cleanup

Author: lkts

server/src/test/java/org/elasticsearch/cluster/routing/IndexRoutingTests.java

@@ -801,13 +801,12 @@ public void testCollectSearchShardsPartitionedWithResharding() throws IOExceptio
                 .build()
         );
 
-        // Since we increased number of shard by two this is the adjustment logic.
+        // Rerouting is in effect due to presence of resharding metadata.
+        // We won't see shard 4 and above (there is a corresponding logic in index operation routing).
         Function<Integer, Integer> adjustForResharding = i -> i < preReshardShards
             ? i
             : IndexReshardingMetadata.newSplitByMultiple(preReshardShards, 2).getSplit().sourceShard(i);
 
-        // Rerouting is in effect due to resharding metadata having a shard in CLONE state.
-        // We won't see shard 4 and above.
         for (var shardAndRouting : shardToRouting.entrySet()) {
             var collectedShards = new ArrayList<Integer>();
             initialReshardingRouting.collectSearchShards(shardAndRouting.getValue(), collectedShards::add);
@@ -833,12 +832,12 @@ public void testCollectSearchShardsPartitionedWithResharding() throws IOExceptio
                 .build()
         );
 
+        // Rerouting is in effect due to presence of resharding metadata.
+        // We won't see shard 4 and above (there is a corresponding logic in index operation routing).
         for (var shardAndRouting : shardToRouting.entrySet()) {
             var collectedShards = new ArrayList<Integer>();
             reshardingRoutingWithShardInHandoff.collectSearchShards(shardAndRouting.getValue(), collectedShards::add);
             assertEquals(2, collectedShards.size());
-            // Rerouting is in effect due to resharding metadata having a shard in CLONE state.
-            // We won't see shard 4 and above.
 
             var expected = new ArrayList<Integer>();
             expected.add(adjustForResharding.apply(shardAndRouting.getKey()));

server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java

@@ -482,15 +482,13 @@ public void testOperationRoutingWithResharding() throws IOException {
         final ProjectId projectId = randomProjectIdOrDefault();
         final String indexName = "test";
         final int shardCount = 1;
-        final int multiple = randomIntBetween(2, 5);
-        final int newShardCount = multiple;
-        final int numberOfReplicas = 1;
+        final int newShardCount = randomIntBetween(2, 5);
 
         var indexMetadata = IndexMetadata.builder(indexName)
-            .settings(indexSettings(IndexVersion.current(), newShardCount, numberOfReplicas))
+            .settings(indexSettings(IndexVersion.current(), newShardCount, 1))
             .numberOfShards(newShardCount)
-            .numberOfReplicas(numberOfReplicas)
-            .reshardingMetadata(IndexReshardingMetadata.newSplitByMultiple(shardCount, multiple))
+            .numberOfReplicas(1)
+            .reshardingMetadata(IndexReshardingMetadata.newSplitByMultiple(shardCount, newShardCount))
             .build();
 
         ClusterState.Builder initialStateBuilder = ClusterState.builder(new ClusterName("test"));
@@ -528,7 +526,7 @@ public void testOperationRoutingWithResharding() throws IOException {
 
         final Index index = clusterService.state().metadata().getProject(projectId).index(indexName).getIndex();
 
-        var shardChangingSplitTargetState = randomIntBetween(1, multiple - 1);
+        var shardChangingSplitTargetState = randomIntBetween(1, newShardCount - 1);
 
         var currentIndexMetadata = clusterService.state().projectState(projectId).metadata().index(indexName);
         var updatedReshardingMetadataOneShardInHandoff = IndexMetadata.builder(currentIndexMetadata)