Address review comments

Signed-off-by: Suraj Singh <[email protected]>
opensearch-project · Aug 1, 2023 · 330e712 · 330e712
1 parent dc79593
commit 330e712
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -4660,7 +4660,8 @@ public void syncSegmentsFromRemoteSegmentStore(boolean overrideLocal, boolean re
                     long processedLocalCheckpoint = Long.parseLong(infosSnapshot.getUserData().get(LOCAL_CHECKPOINT_KEY));
                     store.commitSegmentInfos(infosSnapshot, processedLocalCheckpoint, processedLocalCheckpoint);
                     Collection<String> currentInfoFiles = infosSnapshot.files(true);
-                    if (recoveryState.getStage() != RecoveryState.Stage.DONE) {
+                    // For recovering shards, clean up un-usable incremental refresh files.
+                    if (state() != IndexShardState.STARTED) {
                         for (String localFile : storeDirectory.listAll()) {
                             if (Store.isAutogenerated(localFile) == false && currentInfoFiles.contains(localFile) == false) {
                                 storeDirectory.deleteFile(localFile);

diff --git a/server/src/main/java/org/opensearch/index/store/Store.java b/server/src/main/java/org/opensearch/index/store/Store.java
@@ -390,7 +390,7 @@ public Map<String, StoreFileMetadata> getSegmentMetadataMap(SegmentInfos segment
     public static RecoveryDiff segmentReplicationDiff(Map<String, StoreFileMetadata> source, Map<String, StoreFileMetadata> target) {
         final List<StoreFileMetadata> identical = new ArrayList<>();
         final List<StoreFileMetadata> different = new ArrayList<>();
-        List<StoreFileMetadata> missing = new ArrayList<>();
+        final List<StoreFileMetadata> missing = new ArrayList<>();
         for (StoreFileMetadata value : source.values()) {
             if (value.name().startsWith(IndexFileNames.SEGMENTS)) {
                 continue;