fix bug in clone and update doc string

Signed-off-by: bansvaru <[email protected]>
opensearch-project · Jan 17, 2024 · c257994 · c257994
1 parent 8d6c34b
commit c257994
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/index/remote/RemoteSegmentTransferTracker.java b/server/src/main/java/org/opensearch/index/remote/RemoteSegmentTransferTracker.java
@@ -301,10 +301,15 @@ public Map<String, Long> getLatestLocalFileNameLengthMap() {
     }
 
     /**
-     * Updates the latestLocalFileNameLengthMap by adding file name and it's size to the map. The method is given a function as an argument which is used for determining the file size (length in bytes). This method is also provided the collection of segment files which are the latest refresh local segment files. This method also removes the stale segment files from the map that are not part of the input segment files.
+     * Updates the latestLocalFileNameLengthMap by adding file name and it's size to the map.
+     * The method is given a function as an argument which is used for determining the file size (length in bytes).
+     * This method is also provided the collection of segment files which are the latest refresh local segment files.
+     * This method also removes the stale segment files from the map that are not part of the input segment files.
      *
      * @param segmentFiles     list of local refreshed segment files
      * @param fileSizeFunction function is used to determine the file size in bytes
+     *
+     * @return updated map of local segment files and filesize
      */
     public Map<String, Long> updateLatestLocalFileNameLengthMap(
         Collection<String> segmentFiles,

diff --git a/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java b/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
@@ -41,6 +41,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -215,7 +216,8 @@ private boolean syncSegments() {
                     Collection<String> localSegmentsPostRefresh = segmentInfos.files(true);
 
                     // Create a map of file name to size and update the refresh segment tracker
-                    Map<String, Long> localSegmentsSizeMap = updateLocalSizeMapAndTracker(localSegmentsPostRefresh);
+                    Map<String, Long> localSegmentsSizeMap = updateLocalSizeMapAndTracker(localSegmentsPostRefresh).entrySet().stream()
+                        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
                     CountDownLatch latch = new CountDownLatch(1);
                     ActionListener<Void> segmentUploadsCompletedListener = new LatchedActionListener<>(new ActionListener<>() {
                         @Override
@@ -450,6 +452,8 @@ private void updateRemoteRefreshTimeAndSeqNo(long refreshTimeMs, long refreshClo
      * Updates map of file name to size of the input segment files in the segment tracker. Uses {@code storeDirectory.fileLength(file)} to get the size.
      *
      * @param segmentFiles list of segment files that are part of the most recent local refresh.
+     *
+     * @return updated map of local segment files and filesize
      */
     private Map<String, Long> updateLocalSizeMapAndTracker(Collection<String> segmentFiles) {
         return segmentTracker.updateLatestLocalFileNameLengthMap(segmentFiles, storeDirectory::fileLength);
@@ -527,6 +531,8 @@ private boolean isLocalOrSnapshotRecovery() {
 
     /**
      * Creates an {@link UploadListener} containing the stats population logic which would be triggered before and after segment upload events
+     *
+     * @param fileSizeMap updated map of current snapshot of local segments to their sizes
      */
     private UploadListener createUploadListener(Map<String, Long> fileSizeMap) {
         return new UploadListener() {