PR comments

Signed-off-by: Gaurav Bafna <[email protected]>
opensearch-project · Oct 22, 2023 · bc94de0 · bc94de0
1 parent 3d30b65
commit bc94de0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/index/IndexSettings.java b/server/src/main/java/org/opensearch/index/IndexSettings.java
@@ -1312,7 +1312,7 @@ public TimeValue getRemoteTranslogUploadBufferInterval() {
     }
 
     public int getRemoteTranslogExtraKeep() {
-        return INDEX_REMOTE_TRANSLOG_KEEP_EXTRA_GEN_SETTING.get(settings);
+        return remoteTranslogKeepExtraGen;
     }
 
     /**

diff --git a/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java b/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java
@@ -431,12 +431,12 @@ public void trimUnreferencedReaders() throws IOException {
             }
             generationsToDelete.add(generation);
         }
-        translogTransferManager.deleteStaleTranslogMetadataFilesAsync(remoteGenerationDeletionPermits::release);
         if (generationsToDelete.isEmpty() == false) {
             deleteRemoteGeneration(generationsToDelete);
+            translogTransferManager.deleteStaleTranslogMetadataFilesAsync(remoteGenerationDeletionPermits::release);
             deleteStaleRemotePrimaryTerms();
         } else {
-            remoteGenerationDeletionPermits.release();
+            remoteGenerationDeletionPermits.release(REMOTE_DELETION_PERMITS);
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         public int getRemoteTranslogExtraKeep() {
-            return INDEX_REMOTE_TRANSLOG_KEEP_EXTRA_GEN_SETTING.get(settings);
+            return remoteTranslogKeepExtraGen;
         }
         /**
@@ Expand Down @@