Fix directory casting

Signed-off-by: Sachin Kale <[email protected]>
opensearch-project · Oct 29, 2023 · 9e1468b · 9e1468b
1 parent 8d918b9
commit 9e1468b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 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
@@ -1998,7 +1998,7 @@ public void close(String reason, boolean flushEngine, boolean deleted) throws IO
     /*
     ToDo : Fix this https://github.com/opensearch-project/OpenSearch/issues/8003
      */
-    private RemoteSegmentStoreDirectory getRemoteDirectory() {
+    public RemoteSegmentStoreDirectory getRemoteDirectory() {
         assert indexSettings.isRemoteStoreEnabled();
         assert remoteStore.directory() instanceof FilterDirectory : "Store.directory is not an instance of FilterDirectory";
         FilterDirectory remoteStoreDirectory = (FilterDirectory) remoteStore.directory();

diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java
@@ -506,18 +506,12 @@ private GatedCloseable<IndexCommit> acquireLock(IndexShard indexShard, ShardId s
     }
 
     private void validateSegmentFilesFromAcquiredLock(IndexShard indexShard, long primaryTerm, long generation) throws IOException {
-        Store remoteStore = indexShard.remoteStore();
         Store store = indexShard.store();
         try {
-            remoteStore.incRef();
             store.incRef();
-            String metadataFilename = ((RemoteSegmentStoreDirectory) remoteStore.directory()).getMetadataFileForCommit(
-                primaryTerm,
-                generation
-            );
-            RemoteSegmentMetadata remoteSegmentMetadata = ((RemoteSegmentStoreDirectory) remoteStore.directory()).readMetadataFile(
-                metadataFilename
-            );
+            RemoteSegmentStoreDirectory remoteDirectory = indexShard.getRemoteDirectory();
+            String metadataFilename = remoteDirectory.getMetadataFileForCommit(primaryTerm, generation);
+            RemoteSegmentMetadata remoteSegmentMetadata = remoteDirectory.readMetadataFile(metadataFilename);
             Optional<String> segmentInfosFileName = remoteSegmentMetadata.getMetadata()
                 .keySet()
                 .stream()
@@ -536,7 +530,6 @@ private void validateSegmentFilesFromAcquiredLock(IndexShard indexShard, long pr
                 }
             }
         } finally {
-            remoteStore.decRef();
             store.decRef();
         }
     }