HDDS-8127. Exclude deleted containers from Recon container count

hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ClusterStateEndpoint.java

@@ -24,6 +24,7 @@
 import org.apache.hadoop.hdds.scm.node.NodeStatus;
 import org.apache.hadoop.hdds.scm.server.OzoneStorageContainerManager;
 import org.apache.hadoop.ozone.recon.api.types.ClusterStateResponse;
+import org.apache.hadoop.ozone.recon.api.types.ContainerStateCounts;
 import org.apache.hadoop.ozone.recon.api.types.DatanodeStorageReport;
 import org.apache.hadoop.ozone.recon.persistence.ContainerHealthSchemaManager;
 import org.apache.hadoop.ozone.recon.scm.ReconContainerManager;
@@ -52,7 +53,6 @@
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.VOLUME_TABLE;
 import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.FILE_TABLE;
 
-
 /**
  * Endpoint to fetch current state of ozone cluster.
  */
@@ -91,25 +91,37 @@ public class ClusterStateEndpoint {
    */
   @GET
   public Response getClusterState() {
+    ContainerStateCounts containerStateCounts = new ContainerStateCounts();
     List<DatanodeDetails> datanodeDetails = nodeManager.getAllNodes();
-    int containers = this.containerManager.getContainers().size();
+
     int pipelines = this.pipelineManager.getPipelines().size();
+
     List<UnhealthyContainers> missingContainers = containerHealthSchemaManager
         .getUnhealthyContainers(
             ContainerSchemaDefinition.UnHealthyContainerStates.MISSING,
             0, MISSING_CONTAINER_COUNT_LIMIT);
-    int totalMissingContainerCount = missingContainers.size() ==
-        MISSING_CONTAINER_COUNT_LIMIT ?
-        MISSING_CONTAINER_COUNT_LIMIT : missingContainers.size();
-    int openContainersCount = this.containerManager.getContainerStateCount(
-        HddsProtos.LifeCycleState.OPEN);
+
+    containerStateCounts.setMissingContainerCount(
+        missingContainers.size() == MISSING_CONTAINER_COUNT_LIMIT ?
+            MISSING_CONTAINER_COUNT_LIMIT : missingContainers.size());
+
+    containerStateCounts.setOpenContainersCount(
+        this.containerManager.getContainerStateCount(
+            HddsProtos.LifeCycleState.OPEN));
+
+    containerStateCounts.setDeletedContainersCount(
+        this.containerManager.getContainerStateCount(
+            HddsProtos.LifeCycleState.DELETED));
+
     int healthyDatanodes =
         nodeManager.getNodeCount(NodeStatus.inServiceHealthy()) +
             nodeManager.getNodeCount(NodeStatus.inServiceHealthyReadOnly());
+
     SCMNodeStat stats = nodeManager.getStats();
     DatanodeStorageReport storageReport =
         new DatanodeStorageReport(stats.getCapacity().get(),
             stats.getScmUsed().get(), stats.getRemaining().get());
+
     ClusterStateResponse.Builder builder = ClusterStateResponse.newBuilder();
     GlobalStats volumeRecord = globalStatsDao.findById(
         TableCountTask.getRowKeyFromTable(VOLUME_TABLE));
@@ -156,14 +168,19 @@ public Response getClusterState() {
     builder.setDeletedKeys(deletedKeys);
     builder.setDeletedDirs(deletedDirs);
 
+    // Subtract deleted containers from total containers.
+    containerStateCounts.setTotalContainerCount(
+        this.containerManager.getContainers().size() -
+            containerStateCounts.getDeletedContainersCount());
     ClusterStateResponse response = builder
         .setStorageReport(storageReport)
         .setPipelines(pipelines)
-        .setContainers(containers)
-        .setMissingContainers(totalMissingContainerCount)
+        .setContainers(containerStateCounts.getTotalContainerCount())
+        .setMissingContainers(containerStateCounts.getMissingContainerCount())
         .setTotalDatanodes(datanodeDetails.size())
         .setHealthyDatanodes(healthyDatanodes)
-        .setOpenContainers(openContainersCount)
+        .setOpenContainers(containerStateCounts.getOpenContainersCount())
+        .setDeletedContainers(containerStateCounts.getDeletedContainersCount())
         .build();
     return Response.ok(response).build();
   }

hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/ClusterStateResponse.java

@@ -66,6 +66,12 @@ public final class ClusterStateResponse {
   @JsonProperty("openContainers")
   private int openContainers;
 
+  /**
+   * Total count of deleted containers in the cluster.
+   */
+  @JsonProperty("deletedContainers")
+  private int deletedContainers;
+
   /**
    * Total count of volumes in the cluster.
    */
@@ -118,6 +124,7 @@ private ClusterStateResponse(Builder b) {
     this.openContainers = b.openContainers;
     this.deletedKeys = b.deletedKeys;
     this.deletedDirs = b.deletedDirs;
+    this.deletedContainers = b.deletedContainers;
   }
 
   /**
@@ -132,6 +139,7 @@ public static final class Builder {
     private int containers;
     private int missingContainers;
     private int openContainers;
+    private int deletedContainers;
     private long volumes;
     private long buckets;
     private long keys;
@@ -143,6 +151,7 @@ public Builder() {
       this.containers = 0;
       this.missingContainers = 0;
       this.openContainers = 0;
+      this.deletedContainers = 0;
       this.volumes = 0;
       this.buckets = 0;
       this.keys = 0;
@@ -188,6 +197,11 @@ public Builder setOpenContainers(int openContainers) {
       return this;
     }
 
+    public Builder setDeletedContainers(int deletedContainers) {
+      this.deletedContainers = deletedContainers;
+      return this;
+    }
+
     public Builder setVolumes(long volumes) {
       this.volumes = volumes;
       return this;
@@ -250,6 +264,10 @@ public int getOpenContainers() {
     return openContainers;
   }
 
+  public int getDeletedContainers() {
+    return deletedContainers;
+  }
+
   public long getBuckets() {
     return buckets;
   }

hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/ContainerStateCounts.java

@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.recon.api.types;
+
+/**
+ * Represents statistics related to containers in the Ozone cluster.
+ */
+public class ContainerStateCounts {
+
+  private int totalContainerCount;
+  private int missingContainerCount;
+  private int openContainersCount;
+  private int deletedContainersCount;
+
+  public int getTotalContainerCount() {
+    return totalContainerCount;
+  }
+
+  public void setTotalContainerCount(int totalContainerCount) {
+    this.totalContainerCount = totalContainerCount;
+  }
+
+  public int getMissingContainerCount() {
+    return missingContainerCount;
+  }
+
+  public void setMissingContainerCount(int missingContainerCount) {
+    this.missingContainerCount = missingContainerCount;
+  }
+
+  public int getOpenContainersCount() {
+    return openContainersCount;
+  }
+
+  public void setOpenContainersCount(int openContainersCount) {
+    this.openContainersCount = openContainersCount;
+  }
+
+  public int getDeletedContainersCount() {
+    return deletedContainersCount;
+  }
+
+  public void setDeletedContainersCount(int deletedContainersCount) {
+    this.deletedContainersCount = deletedContainersCount;
+  }
+}