This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 8fcd039cef HDDS-10437. Rename method to
getContainersPendingReplication (#6293)
8fcd039cef is described below
commit 8fcd039cefd1e03b32d63a35034751e19d1b5cbb
Author: Tejaskriya <[email protected]>
AuthorDate: Wed Feb 28 20:37:35 2024 +0530
HDDS-10437. Rename method to getContainersPendingReplication (#6293)
---
.../org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitor.java | 2 +-
.../org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java | 3 ++-
.../org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java | 4 ++--
.../apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java | 2 +-
.../org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java | 8 ++++----
.../hdds/scm/cli/datanode/DecommissionStatusSubCommand.java | 6 +++---
.../hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java | 2 +-
7 files changed, 14 insertions(+), 13 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitor.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitor.java
index fbfbb49c25..7b10f60a57 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitor.java
+++
b/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;
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java
index d7975ff1e5..23bf41dc83 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java
@@ -494,7 +494,8 @@ public class DatanodeAdminMonitorImpl implements
DatanodeAdminMonitor {
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();
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java
index 38e59b89e7..4ace6d22d5 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java
@@ -294,9 +294,9 @@ public class NodeDecommissionManager {
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
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
index faee4fcaaa..2df2a4847e 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
@@ -592,7 +592,7 @@ public class SCMClientProtocolServer implements
@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);
}
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
index 06565e1b7e..5c04ad6321 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
@@ -864,8 +864,8 @@ public class TestDatanodeAdminMonitor {
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 class TestDatanodeAdminMonitor {
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);
}
/**
diff --git
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java
index 17d577ff2d..464b08099d 100644
---
a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java
+++
b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java
@@ -124,12 +124,12 @@ public class DecommissionStatusSubCommand extends
ScmSubcommand {
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;
}
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
index ad0323d334..fce593ab8c 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
@@ -96,7 +96,7 @@ public class TestDecommissionStatusSubCommand {
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
