Incorporate PR review comments

Signed-off-by: Ashish Singh <ssashish@amazon.com>
ashking94 · Sep 18, 2023 · 5595fc2 · 5595fc2
1 parent e74b1c1
commit 5595fc2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java b/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java
@@ -373,7 +373,7 @@ private boolean syncToDisk() throws IOException {
     @Override
     public void sync() throws IOException {
         try {
-            if (syncToDisk() || syncNeeded() || prepareForUpload(null)) {
+            if ((syncToDisk() || syncNeeded()) && prepareForUpload(null)) {
                 performUpload(primaryTermSupplier.getAsLong(), null);
             }
         } catch (final Exception e) {

diff --git a/server/src/main/java/org/opensearch/index/translog/transfer/TranslogTransferManager.java b/server/src/main/java/org/opensearch/index/translog/transfer/TranslogTransferManager.java
@@ -109,7 +109,7 @@ public boolean transferSnapshot(TransferSnapshot transferSnapshot, TranslogTrans
         long prevUploadBytesSucceeded = remoteTranslogTransferTracker.getUploadBytesSucceeded();
         long prevUploadTimeInMillis = remoteTranslogTransferTracker.getTotalUploadTimeInMillis();
 
-        try {
+        try (translogTransferListener) {
             toUpload.addAll(fileTransferTracker.exclusionFilter(transferSnapshot.getTranslogFileSnapshots()));
             toUpload.addAll(fileTransferTracker.exclusionFilter((transferSnapshot.getCheckpointFileSnapshots())));
             if (toUpload.isEmpty()) {
@@ -191,8 +191,6 @@ public boolean transferSnapshot(TransferSnapshot transferSnapshot, TranslogTrans
             captureStatsOnUploadFailure();
             translogTransferListener.onUploadFailed(transferSnapshot, ex);
             return false;
-        } finally {
-            translogTransferListener.close();
         }
     }
 

diff --git a/...c/main/java/org/opensearch/index/translog/transfer/listener/TranslogTransferListener.java b/...c/main/java/org/opensearch/index/translog/transfer/listener/TranslogTransferListener.java
@@ -10,15 +10,14 @@
 
 import org.opensearch.index.translog.transfer.TransferSnapshot;
 
-import java.io.Closeable;
 import java.io.IOException;
 
 /**
  * The listener to be invoked on the completion or failure of a {@link TransferSnapshot}
  *
  * @opensearch.internal
  */
-public interface TranslogTransferListener extends Closeable {
+public interface TranslogTransferListener extends AutoCloseable {
     /**
      * Invoked when the transfer of {@link TransferSnapshot} succeeds
      * @param transferSnapshot the transfer snapshot