Make sure to close the index input of SegmentInfosSnapshot

Signed-off-by: Sachin Kale <[email protected]>
opensearch-project · Apr 16, 2024 · 9fcb9da · 9fcb9da
1 parent ab44a4e
commit 9fcb9da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 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
@@ -5054,11 +5054,13 @@ public void syncSegmentsFromRemoteSegmentStore(boolean overrideLocal, final Runn
                         .filter(file -> file.startsWith(RemoteSegmentStoreDirectory.SEGMENT_INFOS_SNAPSHOT_PREFIX))
                         .collect(Collectors.toList());
                     assert segmentInfosSnapshotFilenames.size() == 1;
-                    infosSnapshot = SegmentInfos.readCommit(
-                        store.directory(),
-                        store.directory().openChecksumInput(segmentInfosSnapshotFilenames.get(0), IOContext.READ),
-                        remoteSegmentMetadata.getGeneration()
-                    );
+                    try (ChecksumIndexInput segmentInfosInput = store.directory().openChecksumInput(segmentInfosSnapshotFilenames.get(0), IOContext.READ)) {
+                        infosSnapshot = SegmentInfos.readCommit(
+                            store.directory(),
+                            segmentInfosInput,
+                            remoteSegmentMetadata.getGeneration()
+                        );
+                    }
                 } else {
                     infosSnapshot = store.buildSegmentInfos(
                         remoteSegmentMetadata.getSegmentInfosBytes(),

diff --git a/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTarget.java b/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTarget.java
@@ -15,6 +15,7 @@
 import org.apache.lucene.index.IndexFormatTooOldException;
 import org.apache.lucene.index.SegmentInfos;
 import org.apache.lucene.store.AlreadyClosedException;
+import org.apache.lucene.store.ChecksumIndexInput;
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexInput;
 import org.opensearch.OpenSearchCorruptionException;
@@ -301,11 +302,13 @@ private void finalizeReplication(CheckpointInfoResponse checkpointInfoResponse)
                     .filter(file -> file.startsWith(RemoteSegmentStoreDirectory.SEGMENT_INFOS_SNAPSHOT_PREFIX))
                     .collect(Collectors.toList());
                 assert segmentInfosSnapshotFilenames.size() == 1;
-                infos = SegmentInfos.readCommit(
-                    store.directory(),
-                    store.directory().openChecksumInput(segmentInfosSnapshotFilenames.get(0), IOContext.READ),
-                    checkpointInfoResponse.getCheckpoint().getSegmentsGen()
-                );
+                try (ChecksumIndexInput segmentInfosInput = store.directory().openChecksumInput(segmentInfosSnapshotFilenames.get(0), IOContext.READ)) {
+                    infos = SegmentInfos.readCommit(
+                        store.directory(),
+                        segmentInfosInput,
+                        checkpointInfoResponse.getCheckpoint().getSegmentsGen()
+                    );
+                }
                 store.deleteQuiet(segmentInfosSnapshotFilenames.get(0));
             } else {
                 infos = store.buildSegmentInfos(segmentInfosBytes, checkpointInfoResponse.getCheckpoint().getSegmentsGen());