Fixing API field name from routing to shards

Signed-off-by: Shourya Dutta Biswas <114977491+shourya035@users.noreply.github.com>
opensearch-project · Jul 11, 2023 · f282d54 · f282d54
1 parent 2213186
commit f282d54
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.../java/org/opensearch/action/admin/cluster/remotestore/stats/RemoteStoreStatsResponse.java b/.../java/org/opensearch/action/admin/cluster/remotestore/stats/RemoteStoreStatsResponse.java
@@ -93,7 +93,7 @@ public String toString() {
     }
 
     static final class Fields {
-        static final String SHARDS = "routing";
+        static final String SHARDS = "shards";
         static final String INDICES = "indices";
     }
 }
diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -4778,14 +4778,12 @@ private String copySegmentFiles(
                     skippedSegments.add(file);
                 }
                 if (targetRemoteDirectory != null) {
-                    targetRemoteDirectory.copyFrom(storeDirectory, file, file, IOContext.DEFAULT);
-                }
-                if (file.startsWith(IndexFileNames.SEGMENTS)) {
-                    assert segmentNFile == null : "There should be only one SegmentInfosSnapshot file";
-                    segmentNFile = file;
+
                 }
+
             }
             beforeSegmentDownload(downloadStatsTracker, segmentsToDownload.size(), totalSizeOfSegmentsToDownload);
+            // Copying segments files to local store directory from remote store directory (Shard Recovery)
             for (String file : segmentsToDownload) {
                 long startTimeInMs = System.currentTimeMillis();
                 try {
@@ -4797,6 +4795,16 @@ private String copySegmentFiles(
                     afterSegmentDownloadFailed(downloadStatsTracker, uploadedSegments.get(file).getLength());
                 }
             }
+            // Copying segment files over to target remote directory from local store directory (Snapshot)
+            for (String file : uploadedSegments.keySet()) {
+                if (targetRemoteDirectory != null) {
+                    targetRemoteDirectory.copyFrom(storeDirectory, file, file, IOContext.DEFAULT);
+                }
+                if (file.startsWith(IndexFileNames.SEGMENTS)) {
+                    assert segmentNFile == null : "There should be only one SegmentInfosSnapshot file";
+                    segmentNFile = file;
+                }
+            }
         } finally {
             logger.info("Downloaded segments here: {}", downloadedSegments);
             logger.info("Skipped download for segments here: {}", skippedSegments);