Use clusterState entry of shallow v2 snapshot

Signed-off-by: Lakshya Taragi <lakshya.taragi@gmail.com>
opensearch-project · Oct 21, 2024 · 0605e73 · 0605e73
1 parent 8212d97
commit 0605e73
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.../org/opensearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/.../org/opensearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
@@ -236,19 +236,21 @@ private Set<String> getNodeIdsOfCurrentSnapshots(final SnapshotsStatusRequest re
                     );
                 }
                 // the actual no. of shards contributed by this current snapshot will now be calculated
-            } else {
+            } else if (currentSnapshotEntry.remoteStoreIndexShallowCopyV2() == false) {
                 // all shards of this current snapshot are required in response
-                totalShardsAcrossCurrentSnapshots = currentSnapshotEntry.shards().size();
+                totalShardsAcrossCurrentSnapshots += currentSnapshotEntry.shards().size();
             }
 
             for (final Map.Entry<ShardId, SnapshotsInProgress.ShardSnapshotStatus> shardStatusEntry : currentSnapshotEntry.shards()
                 .entrySet()) {
                 SnapshotsInProgress.ShardSnapshotStatus shardStatus = shardStatusEntry.getValue();
                 boolean indexPresentInFilter = requestedIndexNames.contains(shardStatusEntry.getKey().getIndexName());
 
-                if (indexPresentInFilter) {
+                if (requestUsesIndexFilter && indexPresentInFilter && currentSnapshotEntry.remoteStoreIndexShallowCopyV2() == false) {
                     // count only those shards whose index belongs to the index-filter
                     totalShardsAcrossCurrentSnapshots++;
+
+                    // for non-index filter case, we already counted all the shards of this current snapshot (non-shallow v2)
                 }
 
                 if (shardStatus.nodeId() != null) {