Address PR comments

Signed-off-by: Sachin Kale <[email protected]>
opensearch-project · Sep 24, 2024 · f649a25 · f649a25
1 parent c6fcae8
commit f649a25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslog.java b/server/src/main/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslog.java
@@ -136,7 +136,7 @@ protected void trimUnreferencedReaders(boolean indexDeleted, boolean trimLocal)
 
         // This is to ensure that after the permits are acquired during primary relocation, there are no further modification on remote
         // store.
-        if ((indexDeleted == false && startedPrimarySupplier.getAsBoolean() == false) || pauseSync.get()) {
+        if (indexDeleted == false && (startedPrimarySupplier.getAsBoolean() == false || pauseSync.get())) {
             return;
         }
 
@@ -505,7 +505,7 @@ protected static Tuple<Long, Long> getMinMaxPrimaryTermFromMetadataFile(
         }
     }
 
-    public static void cleanup(TranslogTransferManager translogTransferManager, boolean forceClean) throws IOException {
+    public static void cleanupOfDeletedIndex(TranslogTransferManager translogTransferManager, boolean forceClean) throws IOException {
         if (forceClean) {
             translogTransferManager.delete();
         } else {
@@ -523,7 +523,7 @@ public void onResponse(List<BlobMetadata> blobMetadata) {
                             metadataFiles,
                             new HashMap<>(),
                             Long.MAX_VALUE,
-                            true,
+                            true,  // This method gets called when the index is no longer present
                             staticLogger
                         );
                         if (metadataFilesToBeDeleted.isEmpty()) {

diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java
@@ -2279,7 +2279,7 @@ private void remoteTranslogCleanupAsync(
             indexMetadataEnabled
         );
         try {
-            RemoteFsTimestampAwareTranslog.cleanup(translogTransferManager, forceClean);
+            RemoteFsTimestampAwareTranslog.cleanupOfDeletedIndex(translogTransferManager, forceClean);
         } catch (IOException e) {
             logger.error("Exception while cleaning up remote translog for shard: " + shardId, e);
         }