HDDS-12210. Use correct BootstrapStateHandler.Lock in SnapshotDeletingService (apache#7991)

Author: hemantk-12

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java

@@ -649,8 +649,9 @@ static class Lock extends BootstrapStateHandler.Lock {
       locks = Stream.of(
           om.getKeyManager().getDeletingService(),
           om.getKeyManager().getSnapshotSstFilteringService(),
-          om.getMetadataManager().getStore().getRocksDBCheckpointDiffer(),
-          om.getKeyManager().getSnapshotDeletingService()
+          om.getKeyManager().getSnapshotDeletingService(),
+          om.getKeyManager().getSnapshotDirectoryService(),
+          om.getMetadataManager().getStore().getRocksDBCheckpointDiffer()
       )
           .filter(Objects::nonNull)
           .map(BootstrapStateHandler::getBootstrapStateLock)

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDeletingService.java

@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -61,6 +62,7 @@
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotMoveKeyInfos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotMoveTableKeysRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotPurgeRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
 import org.apache.ratis.protocol.ClientId;
 import org.slf4j.Logger;
@@ -238,7 +240,7 @@ public BackgroundTaskResult call() throws InterruptedException {
       return BackgroundTaskResult.EmptyTaskResult.newResult();
     }
 
-    private void submitSnapshotPurgeRequest(List<String> purgeSnapshotKeys) {
+    private void submitSnapshotPurgeRequest(List<String> purgeSnapshotKeys) throws InterruptedException {
       if (!purgeSnapshotKeys.isEmpty()) {
         SnapshotPurgeRequest snapshotPurgeRequest = SnapshotPurgeRequest
             .newBuilder()
@@ -251,14 +253,16 @@ private void submitSnapshotPurgeRequest(List<String> purgeSnapshotKeys) {
             .setClientId(clientId.toString())
             .build();
 
-        submitRequest(omRequest);
+        try (BootstrapStateHandler.Lock lock = getBootstrapStateLock().lock()) {
+          submitRequest(omRequest);
+        }
       }
     }
 
     private void submitSnapshotMoveDeletedKeys(SnapshotInfo snapInfo,
                                                List<SnapshotMoveKeyInfos> deletedKeys,
                                                List<HddsProtos.KeyValue> renamedList,
-                                               List<SnapshotMoveKeyInfos> dirsToMove) {
+                                               List<SnapshotMoveKeyInfos> dirsToMove) throws InterruptedException {
 
       SnapshotMoveTableKeysRequest.Builder moveDeletedKeysBuilder = SnapshotMoveTableKeysRequest.newBuilder()
           .setFromSnapshotID(toProtobuf(snapInfo.getSnapshotId()));
@@ -287,15 +291,18 @@ private void submitSnapshotMoveDeletedKeys(SnapshotInfo snapInfo,
           .setSnapshotMoveTableKeysRequest(moveDeletedKeys)
           .setClientId(clientId.toString())
           .build();
-
-      try (BootstrapStateHandler.Lock lock = new BootstrapStateHandler.Lock()) {
+      try (BootstrapStateHandler.Lock lock = getBootstrapStateLock().lock()) {
         submitRequest(omRequest);
       }
     }
 
     private void submitRequest(OMRequest omRequest) {
       try {
-        OzoneManagerRatisUtils.submitRequest(ozoneManager, omRequest, clientId, getRunCount().get());
+        Status status =
+            OzoneManagerRatisUtils.submitRequest(ozoneManager, omRequest, clientId, getRunCount().get()).getStatus();
+        if (!Objects.equals(status, Status.OK)) {
+          LOG.error("Request: {} failed with an status: {}. Will retry in the next run.", omRequest, status);
+        }
       } catch (ServiceException e) {
         LOG.error("Request: {} fired by SnapshotDeletingService failed. Will retry in the next run", omRequest, e);
       }