From 6796c7a5cfde8793bdcea0e2ee1e9cbe5cb8fdfe Mon Sep 17 00:00:00 2001
From: Ashish Singh <ssashish@amazon.com>
Date: Tue, 11 Jul 2023 22:20:58 +0530
Subject: [PATCH] Fix segments upload retry regression introduced in PR #7119

Signed-off-by: Ashish Singh <ssashish@amazon.com>
---
 .../shard/RemoteStoreRefreshListener.java      | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java b/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
index e087bbb265727..4e8752178eb57 100644
--- a/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
+++ b/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
@@ -195,9 +195,9 @@ private synchronized void syncSegments(boolean isRetry) {
         long refreshTimeMs = segmentTracker.getLocalRefreshTimeMs(), refreshClockTimeMs = segmentTracker.getLocalRefreshClockTimeMs();
         long refreshSeqNo = segmentTracker.getLocalRefreshSeqNo();
         long bytesBeforeUpload = segmentTracker.getUploadBytesSucceeded(), startTimeInNS = System.nanoTime();
+        final AtomicBoolean shouldRetry = new AtomicBoolean(true);
 
         try {
-
             if (this.primaryTerm != indexShard.getOperationPrimaryTerm()) {
                 this.primaryTerm = indexShard.getOperationPrimaryTerm();
                 this.remoteDirectory.init();
@@ -251,7 +251,6 @@ private synchronized void syncSegments(boolean isRetry) {
                         ActionListener<Void> segmentUploadsCompletedListener = new LatchedActionListener<>(new ActionListener<>() {
                             @Override
                             public void onResponse(Void unused) {
-                                boolean shouldRetry = true;
                                 try {
                                     // Start metadata file upload
                                     uploadMetadata(localSegmentsPostRefresh, segmentInfos);
@@ -265,27 +264,18 @@ public void onResponse(Void unused) {
                                     );
                                     // At this point since we have uploaded new segments, segment infos and segment metadata file,
                                     // along with marking minSeqNoToKeep, upload has succeeded completely.
-                                    shouldRetry = false;
+                                    shouldRetry.set(false);
                                 } catch (Exception e) {
                                     // We don't want to fail refresh if upload of new segments fails. The missed segments will be re-tried
                                     // in the next refresh. This should not affect durability of the indexed data after remote trans-log
                                     // integration.
                                     logger.warn("Exception in post new segment upload actions", e);
-                                } finally {
-                                    doComplete(shouldRetry);
                                 }
                             }
 
                             @Override
                             public void onFailure(Exception e) {
                                 logger.warn("Exception while uploading new segments to the remote segment store", e);
-                                doComplete(true);
-                            }
-
-                            private void doComplete(boolean shouldRetry) {
-                                // Update the segment tracker with the final upload status as seen at the end
-                                updateFinalUploadStatusInSegmentTracker(shouldRetry == false, bytesBeforeUpload, startTimeInNS);
-                                afterSegmentsSync(isRetry, shouldRetry);
                             }
                         }, latch);
 
@@ -303,7 +293,11 @@ private void doComplete(boolean shouldRetry) {
             }
         } catch (Throwable t) {
             logger.error("Exception in RemoteStoreRefreshListener.afterRefresh()", t);
+        } finally {
+            // Update the segment tracker with the final upload status as seen at the end
+            updateFinalUploadStatusInSegmentTracker(shouldRetry.get() == false, bytesBeforeUpload, startTimeInNS);
         }
+        afterSegmentsSync(isRetry, shouldRetry.get());
     }
 
     /**