Merge branch 'collab-central' of github.com:Gaurav614/OpenSearch into…

… collab-central Signed-off-by: Aman Khare <[email protected]>
Gaurav614 · Mar 19, 2024 · 9673843 · 9673843
2 parents a1a4696 + bffa5cd
commit 9673843
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/gateway/ReplicaShardBatchAllocator.java b/server/src/main/java/org/opensearch/gateway/ReplicaShardBatchAllocator.java
@@ -55,7 +55,6 @@ public void processExistingRecoveries(RoutingAllocation allocation, List<List<Sh
             List<ShardRouting> ineligibleShards = new ArrayList<>();
             // iterate over shards to check for match for each of those
             for (ShardRouting shard : shardBatch) {
-                // need to iterate over all the nodes to find matching shard
                 if (shard != null && !shard.primary()) {
                     if (shouldSkipFetchForRecovery(shard)) {
                         ineligibleShards.add(shard);
@@ -171,9 +170,8 @@ private Map<DiscoveryNode, StoreFilesMetadata> convertToNodeStoreFilesMetadataMa
         ShardRouting unassignedShard,
         FetchResult<NodeStoreFilesMetadataBatch> data
     ) {
-
         if (!data.hasData()) {
-            return new HashMap<>();
+            return null;
         }
 
         Map<DiscoveryNode, StoreFilesMetadata> map = new HashMap<>();

diff --git a/server/src/test/java/org/opensearch/gateway/ReplicaShardBatchAllocatorTests.java b/server/src/test/java/org/opensearch/gateway/ReplicaShardBatchAllocatorTests.java
@@ -834,7 +834,11 @@ protected AsyncShardFetch.FetchResult<NodeStoreFilesMetadataBatch> fetchData(
                     );
                 }
             }
-            return new AsyncShardFetch.FetchResult<>(tData, Collections.<ShardId, Set<String>>emptyMap());
+            return new AsyncShardFetch.FetchResult<>(tData, new HashMap<>(){
+                {
+                    put(shardId, Collections.emptySet());
+                }
+            });
         }
 
         @Override