update descriptiona dn add 2 metrics

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

@@ -59,11 +59,11 @@ public static void unRegister() {
   /*
    * Total directory deletion metrics across all iterations of DirectoryDeletingService since last restart.
    */
-  @Metric("Total no. of directories deleted")
+  @Metric("Total no. of deleted directories sent for purge")
   private MutableGaugeLong numDirDeleted;
-  @Metric("Total no. of directories moved to deletedDirectoryTable")
+  @Metric("Total no. of sub-directories sent for purge")
   private MutableGaugeLong numDirsMoved;
-  @Metric("Total no. of files moved to deletedTable")
+  @Metric("Total no. of sub-files sent for purge")
   private MutableGaugeLong numFilesMoved;
 
   public void incrNumDirDeleted(long dirDel) {
@@ -97,9 +97,9 @@ public void incrementDirectoryDeletionTotalMetrics(long dirDel, long dirMove, lo
   private MutableGaugeLong iterationDirDeleted;
   @Metric("No. of sub-directories deleted in last iteration")
   private MutableGaugeLong iterationSubDirDeleted;
-  @Metric("No. of sub-directories moved to deletedDirectoryTable in last iteration")
+  @Metric("No. of sub-directories sent for purge in last iteration")
   private MutableGaugeLong iterationSubDirsMoved;
-  @Metric("No. of files moved to deletedTable in last iteration")
+  @Metric("No. of files sent for purge in last iteration")
   private MutableGaugeLong iterationFilesMoved;
 
   public void setIterationDirRunCount(long runcount) {
@@ -151,6 +151,8 @@ public void setDirectoryDeletionIterationMetrics(long runcount, long startTime,
   private MutableGaugeLong numKeysDeletionRequest;
   @Metric("Total no. of keys deleted successfully")
   private MutableGaugeLong numKeysDeleteSuccess;
+  @Metric("Total no. of deleted keys sent for purge")
+  private MutableGaugeLong numKeysSentForPurge;
 
   public void incrNumKeysProcessed(long keysProcessed) {
     this.numKeysProcessed.incr(keysProcessed);
@@ -164,6 +166,10 @@ public void incrNumKeysDeleteSuccess(long keysDeleteSuccess) {
     this.numKeysDeleteSuccess.incr(keysDeleteSuccess);
   }
 
+  public void incrNumKeysSentForPurge(long keysPurge) {
+    this.numKeysSentForPurge.incr(keysPurge);
+  }
+
   /*
    * Key deletion metrics in the latest iteration of KeyDeletingService.
    */
@@ -179,6 +185,8 @@ public void incrNumKeysDeleteSuccess(long keysDeleteSuccess) {
   private MutableGaugeLong iterationKeysDeletionRequest;
   @Metric("Total no. of keys deleted successfully")
   private MutableGaugeLong iterationKeysDeleteSuccess;
+  @Metric("Total no. of deleted keys sent for purge")
+  private MutableGaugeLong iterationKeysSentForPurge;
 
   public void setIterationKeyRunCount(long iterationKeyRunCount) {
     this.iterationKeyRunCount.set(iterationKeyRunCount);
@@ -204,17 +212,17 @@ public void setIterationKeysDeleteSuccess(long iterationKeysDeleteSuccess) {
     this.iterationKeysDeleteSuccess.set(iterationKeysDeleteSuccess);
   }
 
+  public void setIterationKeysSentForPurge(long keysPurge) {
+    this.iterationKeysSentForPurge.set(keysPurge);
+  }
+
   /*
    * Directory purge request metrics.
    */
   @Metric("Total no. of directories purged")
   private MutableGaugeLong numDirPurged;
   @Metric("Total no. of subFiles purged")
   private MutableGaugeLong numSubKeysPurged;
-  @Metric("No. of directories purged in latest request")
-  private MutableGaugeLong numDirPurgedInLatestRequest;
-  @Metric("No. of subFiles purged in latest request")
-  private MutableGaugeLong numSubKeysPurgedInLatestRequest;
 
   public void incrNumDirPurged(long dirPurged) {
     this.numDirPurged.incr(dirPurged);
@@ -224,14 +232,6 @@ public void incrNumSubKeysPurged(long subKeysPurged) {
     this.numSubKeysPurged.incr(subKeysPurged);
   }
 
-  public void setNumDirPurgedInLatestRequest(long numDirPurgedInLastRequest) {
-    this.numDirPurgedInLatestRequest.set(numDirPurgedInLastRequest);
-  }
-
-  public void setNumSubKeysPurgedInLatestRequest(long numSubKeysPurgedInLastRequest) {
-    this.numSubKeysPurgedInLatestRequest.set(numSubKeysPurgedInLastRequest);
-  }
-
   /*
    * Key purge request metrics.
    */
@@ -261,7 +261,7 @@ public void setNumKeysPurgedInLatestRequest(long numSubKeysPurgedInLastRequest)
   private MutableGaugeLong iterationDurationOpenKeyCleanup;
   @Metric("No. of keys deleted by OpenKeyCleanupService in last iteration")
   private MutableGaugeLong iterationOpenKeysDeleted;
-  @Metric("No. of keys deleted by OpenKeyCleanupService in last iteration")
+  @Metric("No. of hsync keys committed by OpenKeyCleanupService in last iteration")
   private MutableGaugeLong iterationOpenKeysCommitted;
 
   public void setIterationRunCountOpenKeyCleanup(

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java

@@ -176,8 +176,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, TermIn
           }
         }
       }
-      deletingServiceMetrics.setNumDirPurgedInLatestRequest(numDirDeleted);
-      deletingServiceMetrics.setNumSubKeysPurgedInLatestRequest(numSubFilesDeleted);
 
       if (fromSnapshotInfo != null) {
         fromSnapshotInfo.setLastTransactionInfo(TransactionInfo.valueOf(termIndex).toByteString());

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

@@ -231,7 +231,9 @@ public BackgroundTaskResult call() {
             metrics.setIterationKeyStartTime(startTime);
             metrics.setIterationKeyDuration(Time.monotonicNow() - startTime);
             metrics.setIterationKeysProcessed(keyBlocksList.size());
+            metrics.setIterationKeysSentForPurge(delCount);
             metrics.incrNumKeysProcessed(keyBlocksList.size());
+            metrics.incrNumKeysSentForPurge(delCount);
           }
         } catch (IOException e) {
           LOG.error("Error while running delete keys background task. Will " +