From 22e940c71338f8657ff87e7a0e9ca96cd66f2837 Mon Sep 17 00:00:00 2001
From: bansvaru <bansvaru@amazon.com>
Date: Fri, 13 Oct 2023 15:28:00 +0530
Subject: [PATCH] fix lock release before deletion is completed

Signed-off-by: bansvaru <bansvaru@amazon.com>
---
 .../opensearch/gateway/remote/RemoteClusterStateService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java
index 4a8a0618ffa60..bbea6d2faf4af 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java
@@ -881,8 +881,9 @@ public void onFailure(Exception e) {
                     }
                 }
             );
-        } finally {
+        } catch (Exception e) {
             deleteStaleMetadataRunning.set(false);
+            throw e;
         }
     }
 
@@ -952,7 +953,7 @@ private void deleteStalePaths(String clusterName, String clusterUUID, List<Strin
     public void deleteStaleClusterUUIDs(ClusterState clusterState, ClusterMetadataManifest committedManifest) {
         threadpool.executor(ThreadPool.Names.REMOTE_PURGE).execute(() -> {
             String clusterName = clusterState.getClusterName().value();
-            logger.info("Deleting stale cluster UUIDs data from remote [{}]", clusterName);
+            logger.debug("Deleting stale cluster UUIDs data from remote [{}]", clusterName);
             Set<String> allClustersUUIDsInRemote;
             try {
                 allClustersUUIDsInRemote = new HashSet<>(getAllClusterUUIDs(clusterState.getClusterName().value()));