HDDS-10437. Rename method to getContainersPendingReplication (#6293)

Author: Tejaskriya

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitor.java

@@ -35,6 +35,6 @@ public interface DatanodeAdminMonitor extends Runnable {
   void stopMonitoring(DatanodeDetails dn);
   Set<DatanodeAdminMonitorImpl.TrackedNode> getTrackedNodes();
   void setMetrics(NodeDecommissionMetrics metrics);
-  Map<String, List<ContainerID>> getContainersReplicatedOnNode(DatanodeDetails dn)
+  Map<String, List<ContainerID>> getContainersPendingReplication(DatanodeDetails dn)
       throws NodeNotFoundException;
 }

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java

@@ -494,7 +494,8 @@ private boolean checkContainersReplicatedOnNode(TrackedNode dn)
     return underReplicated == 0 && unclosed == 0;
   }
 
-  public Map<String, List<ContainerID>> getContainersReplicatedOnNode(DatanodeDetails dn) {
+  @Override
+  public Map<String, List<ContainerID>> getContainersPendingReplication(DatanodeDetails dn) {
     Iterator<TrackedNode> iterator = trackedNodes.iterator();
     while (iterator.hasNext()) {
       TrackedNode trackedNode = iterator.next();

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java

@@ -294,9 +294,9 @@ public NodeDecommissionManager(OzoneConfiguration config, NodeManager nm,
         TimeUnit.SECONDS);
   }
 
-  public Map<String, List<ContainerID>> getContainersReplicatedOnNode(DatanodeDetails dn)
+  public Map<String, List<ContainerID>> getContainersPendingReplication(DatanodeDetails dn)
       throws NodeNotFoundException {
-    return getMonitor().getContainersReplicatedOnNode(dn);
+    return getMonitor().getContainersPendingReplication(dn);
   }
 
   @VisibleForTesting

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java

@@ -592,7 +592,7 @@ public void deleteContainer(long containerID) throws IOException {
   @Override
   public Map<String, List<ContainerID>> getContainersOnDecomNode(DatanodeDetails dn) throws IOException {
     try {
-      return scm.getScmDecommissionManager().getContainersReplicatedOnNode(dn);
+      return scm.getScmDecommissionManager().getContainersPendingReplication(dn);
     } catch (NodeNotFoundException e) {
       throw new IOException("Failed to get containers list. Unable to find required node", e);
     }

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java

@@ -864,8 +864,8 @@ public void testContainersReplicatedOnDecomDnAPI()
     assertEquals(1, monitor.getTrackedNodeCount());
     assertEquals(HddsProtos.NodeOperationalState.DECOMMISSIONING,
         nodeManager.getNodeStatus(dn1).getOperationalState());
-    assertEquals(monitor.getContainersReplicatedOnNode(dn1).get("UnderReplicated").size(), 2);
-    assertEquals(monitor.getContainersReplicatedOnNode(dn1).get("UnClosed").size(), 0);
+    assertEquals(monitor.getContainersPendingReplication(dn1).get("UnderReplicated").size(), 2);
+    assertEquals(monitor.getContainersPendingReplication(dn1).get("UnClosed").size(), 0);
 
     DatanodeAdminMonitorTestUtil
         .mockGetContainerReplicaCount(repManager,
@@ -877,8 +877,8 @@ public void testContainersReplicatedOnDecomDnAPI()
     assertEquals(1, monitor.getTrackedNodeCount());
     assertEquals(HddsProtos.NodeOperationalState.DECOMMISSIONING,
         nodeManager.getNodeStatus(dn1).getOperationalState());
-    assertEquals(monitor.getContainersReplicatedOnNode(dn1).get("UnderReplicated").size(), 0);
-    assertEquals(monitor.getContainersReplicatedOnNode(dn1).get("UnClosed").size(), 2);
+    assertEquals(monitor.getContainersPendingReplication(dn1).get("UnderReplicated").size(), 0);
+    assertEquals(monitor.getContainersPendingReplication(dn1).get("UnClosed").size(), 2);
   }
 
   /**

hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java

@@ -124,12 +124,12 @@ private void printCounts(DatanodeDetails datanode, JsonNode counts, int numDecom
           double underReplicated = Double.parseDouble(counts.get("UnderReplicatedDN." + i).toString());
           double unclosed = Double.parseDouble(counts.get("UnclosedContainersDN." + i).toString());
           long startTime = Long.parseLong(counts.get("StartTimeDN." + i).toString());
-          System.out.print("Decommission started at : ");
+          System.out.print("Decommission Started At : ");
           Date date = new Date(startTime);
           DateFormat formatter = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss z");
           System.out.println(formatter.format(date));
-          System.out.println("No. of Pipelines: " + pipelines);
-          System.out.println("No. of UnderReplicated containers: " + underReplicated);
+          System.out.println("No. of Unclosed Pipelines: " + pipelines);
+          System.out.println("No. of UnderReplicated Containers: " + underReplicated);
           System.out.println("No. of Unclosed Containers: " + unclosed);
           return;
         }

hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java

@@ -96,7 +96,7 @@ public void testSuccessWhenDecommissionStatus() throws IOException {
     p = Pattern.compile("Datanode:\\s.*host1\\)");
     m = p.matcher(outContent.toString(DEFAULT_ENCODING));
     assertTrue(m.find());
-    p = Pattern.compile("No\\. of Pipelines:");
+    p = Pattern.compile("No\\. of Unclosed Pipelines:");
     m = p.matcher(outContent.toString(DEFAULT_ENCODING));
     assertTrue(m.find());
     assertTrue(m.find()); // metrics for both are shown