Backport some deletion bug fixes commits from master to ozone-1.4

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

@@ -75,7 +75,7 @@ public abstract class AbstractKeyDeletingService extends BackgroundService
 
   private final OzoneManager ozoneManager;
   private final ScmBlockLocationProtocol scmClient;
-  private static ClientId clientId = ClientId.randomId();
+  private final ClientId clientId = ClientId.randomId();
   private final AtomicLong deletedDirsCount;
   private final AtomicLong movedDirsCount;
   private final AtomicLong movedFilesCount;
@@ -252,7 +252,7 @@ private int submitPurgeKeysRequest(List<DeleteBlockGroupResult> results,
       ozoneManager.getOmRatisServer().submitRequest(omRequest,
           raftClientRequest);
     } catch (ServiceException e) {
-      LOG.error("PurgeKey request failed. Will retry at next run.");
+      LOG.error("PurgeKey request failed. Will retry at next run.", e);
       return 0;
     }
 
@@ -321,7 +321,7 @@ protected void submitPurgePaths(List<PurgePathRequest> requests,
             .submitRequest(null, omRequest);
       }
     } catch (ServiceException e) {
-      LOG.error("PurgePaths request failed. Will retry at next run.");
+      LOG.error("PurgePaths request failed. Will retry at next run.", e);
     }
   }
 
@@ -435,6 +435,8 @@ public long optimizeDirDeletesAndSubmitRequest(long remainNum,
         }
         consumedSize += request.getSerializedSize();
         purgePathRequestList.add(request);
+        // reduce remain count for self, sub-files, and sub-directories
+        remainNum = remainNum - 1;
         remainNum = remainNum - request.getDeletedSubFilesCount();
         remainNum = remainNum - request.getMarkDeletedSubDirsCount();
         // Count up the purgeDeletedDir, subDirs and subFiles

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

@@ -36,7 +36,6 @@
 import org.apache.hadoop.ozone.om.snapshot.ReferenceCounted;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PurgePathRequest;
 import org.apache.hadoop.util.Time;
-import org.apache.ratis.protocol.ClientId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,8 +69,6 @@ public class DirectoryDeletingService extends AbstractKeyDeletingService {
   public static final Logger LOG =
       LoggerFactory.getLogger(DirectoryDeletingService.class);
 
-  private static ClientId clientId = ClientId.randomId();
-
   // Use only a single thread for DirDeletion. Multiple threads would read
   // or write to same tables and can send deletion requests for same key
   // multiple times.
@@ -196,6 +193,8 @@ public BackgroundTaskResult call() {
             }
             consumedSize += request.getSerializedSize();
             purgePathRequestList.add(request);
+            // reduce remain count for self, sub-files, and sub-directories
+            remainNum = remainNum - 1;
             remainNum = remainNum - request.getDeletedSubFilesCount();
             remainNum = remainNum - request.getMarkDeletedSubDirsCount();
             // Count up the purgeDeletedDir, subDirs and subFiles

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

@@ -407,7 +407,7 @@ public void setOMDBRangerServiceVersion(long version)
           raftClientRequest);
     } catch (ServiceException e) {
       LOG.error("SetRangerServiceVersion request failed. "
-          + "Will retry at next run.");
+          + "Will retry at next run.", e);
       throw e;
     }
   }

hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingService.java

@@ -48,7 +48,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DIR_DELETING_SERVICE_INTERVAL;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_PATH_DELETING_LIMIT_PER_TASK_DEFAULT;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test Directory Deleting Service.
@@ -157,4 +160,54 @@ public void testDeleteDirectoryCrossingSizeLimit() throws Exception {
         500, 60000);
     Assertions.assertTrue(dirDeletingService.getRunCount().get() >= 1);
   }
+
+  @Test
+  public void testDeleteDirectoryFlatDirsHavingNoChilds() throws Exception {
+    OzoneConfiguration conf = createConfAndInitValues();
+    OmTestManagers omTestManagers
+        = new OmTestManagers(conf);
+    KeyManager keyManager = omTestManagers.getKeyManager();
+    writeClient = omTestManagers.getWriteClient();
+    om = omTestManagers.getOzoneManager();
+
+    OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName,
+        om.getMetadataManager(), BucketLayout.FILE_SYSTEM_OPTIMIZED);
+    String bucketKey = om.getMetadataManager().getBucketKey(volumeName, bucketName);
+    OmBucketInfo bucketInfo = om.getMetadataManager().getBucketTable().get(bucketKey);
+
+    int dirCreatesCount = OZONE_PATH_DELETING_LIMIT_PER_TASK_DEFAULT * 2 + 100;
+    long parentId = 1;
+    OmDirectoryInfo baseDir = new OmDirectoryInfo.Builder().setName("dir_base")
+        .setCreationTime(Time.now()).setModificationTime(Time.now())
+        .setObjectID(parentId).setParentObjectID(bucketInfo.getObjectID())
+        .setUpdateID(0).build();
+    OMRequestTestUtils.addDirKeyToDirTable(true, baseDir, volumeName, bucketName,
+        1L, om.getMetadataManager());
+    for (int i = 0; i < dirCreatesCount; ++i) {
+      OmDirectoryInfo dir1 = new OmDirectoryInfo.Builder().setName("dir" + i)
+          .setCreationTime(Time.now()).setModificationTime(Time.now()).setParentObjectID(parentId)
+          .setObjectID(i + 100).setUpdateID(i).build();
+      OMRequestTestUtils.addDirKeyToDirTable(true, dir1, volumeName, bucketName,
+          1L, om.getMetadataManager());
+    }
+    DirectoryDeletingService dirDeletingService = (DirectoryDeletingService) keyManager.getDirDeletingService();
+    long[] delDirCnt = new long[2];
+    delDirCnt[0] = dirDeletingService.getDeletedDirsCount();
+
+    OmKeyArgs delArgs = new OmKeyArgs.Builder()
+        .setVolumeName(volumeName).setBucketName(bucketName).setKeyName("dir_base")
+        .setReplicationConfig(StandaloneReplicationConfig.getInstance(ONE))
+        .setDataSize(0).setRecursive(true).build();
+    writeClient.deleteKey(delArgs);
+
+    // check if difference between each run should not cross the directory deletion limit
+    // and wait till all dir is removed
+    GenericTestUtils.waitFor(() -> {
+      delDirCnt[1] = dirDeletingService.getDeletedDirsCount();
+      assertTrue(delDirCnt[1] - delDirCnt[0] <= OZONE_PATH_DELETING_LIMIT_PER_TASK_DEFAULT,
+          "base: " + delDirCnt[0] + ", new: " + delDirCnt[1]);
+      delDirCnt[0] =  delDirCnt[1];
+      return dirDeletingService.getDeletedDirsCount() >= dirCreatesCount;
+    }, 500, 300000);
+  }
 }