From 8af5c8c42e4b592af6b1d18990fd0210c0aa6565 Mon Sep 17 00:00:00 2001
From: Ashish <ssashish@amazon.com>
Date: Mon, 13 Nov 2023 02:10:01 +0530
Subject: [PATCH] [Remote Translog] Fix translog inconsistent generation
 assertion failure in ITs (#10985)

Signed-off-by: Shivansh Arora <hishiv@amazon.com>
---
 .../index/translog/RemoteFsTranslog.java           | 14 ++++++++------
 1 file changed, 8 insertions(+), 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
index 65d16e213cad1..8fb420e8fa1da 100644
--- a/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java
+++ b/server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java
@@ -380,12 +380,14 @@ public boolean syncNeeded() {
     public void close() throws IOException {
         assert Translog.calledFromOutsideOrViaTragedyClose() : shardId
             + "Translog.close method is called from inside Translog, but not via closeOnTragicEvent method";
-        if (closed.compareAndSet(false, true)) {
-            try (ReleasableLock lock = writeLock.acquire()) {
-                sync();
-            } finally {
-                logger.debug("translog closed");
-                closeFilesIfNoPendingRetentionLocks();
+        try (ReleasableLock lock = writeLock.acquire()) {
+            if (closed.compareAndSet(false, true)) {
+                try {
+                    sync();
+                } finally {
+                    logger.debug("translog closed");
+                    closeFilesIfNoPendingRetentionLocks();
+                }
             }
         }
     }