Skip iterating over Routing Nodes

Signed-off-by: Shivansh Arora <[email protected]>
Gaurav614 · Mar 19, 2024 · bffa5cd · bffa5cd
1 parent e2b8c0b
commit bffa5cd
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/server/src/main/java/org/opensearch/gateway/ReplicaShardBatchAllocator.java b/server/src/main/java/org/opensearch/gateway/ReplicaShardBatchAllocator.java
@@ -54,24 +54,15 @@ public void processExistingRecoveries(RoutingAllocation allocation, List<List<Sh
         for (List<ShardRouting> shardBatch : shardBatches) {
             List<ShardRouting> eligibleShards = new ArrayList<>();
             List<ShardRouting> ineligibleShards = new ArrayList<>();
-            boolean shardMatched;
             // iterate over shards to check for match for each of those
             for (ShardRouting shard : shardBatch) {
-                shardMatched = false;
-                // need to iterate over all the nodes to find matching shard
-                for (RoutingNode routingNode : routingNodes) {
-                    ShardRouting shardFromRoutingNode = routingNode.getByShardId(shard.shardId());
-                    if (shardFromRoutingNode != null && !shardFromRoutingNode.primary()) {
-                        shardMatched = true;
-                        if (shouldSkipFetchForRecovery(shardFromRoutingNode)) {
-                            ineligibleShards.add(shardFromRoutingNode);
-                            continue;
-                        }
-                        eligibleShards.add(shardFromRoutingNode);
-                    }
-                    if (shardMatched) {
-                        break;
+                if (shard != null && !shard.primary()) {
+                    // need to iterate over all the nodes to find matching shard
+                    if (shouldSkipFetchForRecovery(shard)) {
+                        ineligibleShards.add(shard);
+                        continue;
                     }
+                    eligibleShards.add(shard);
                 }
             }
             AsyncShardFetch.FetchResult<NodeStoreFilesMetadataBatch> shardState = fetchData(eligibleShards, ineligibleShards, allocation);