Fix tests by changing read-write concurrency

Signed-off-by: Sachin Kale <[email protected]>
opensearch-project · Dec 12, 2022 · 33104a1 · 33104a1
1 parent f3b1ae9
commit 33104a1
Showing 1 changed file with 3 additions and 11 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
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.function.LongConsumer;
 import java.util.function.LongSupplier;
@@ -174,24 +173,17 @@ protected ArrayList<TranslogReader> recoverFromFiles(Checkpoint checkpoint) thro
 
     @Override
     public boolean ensureSynced(Location location) throws IOException {
-        Callable<Boolean> execute = () -> false;
-        try (ReleasableLock lock = readLock.acquire()) {
+        try (ReleasableLock ignored = writeLock.acquire()) {
             assert location.generation <= current.getGeneration();
             if (location.generation == current.getGeneration()) {
                 ensureOpen();
-                execute = () -> prepareAndUpload(primaryTermSupplier.getAsLong(), location.generation);
+                return prepareAndUpload(primaryTermSupplier.getAsLong(), location.generation);
             }
         } catch (final Exception ex) {
             closeOnTragicEvent(ex);
             throw ex;
         }
-        try {
-            return execute.call();
-        } catch (Exception ex) {
-            closeOnTragicEvent(ex);
-            assert ex instanceof IOException;
-            throw (IOException) ex;
-        }
+        return false;
     }
 
     @Override