Skip to content

HDDS-10437. Rename method to getContainersPendingReplication #6293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sodonnel merged 2 commits into from
Feb 28, 2024
Merged

HDDS-10437. Rename method to getContainersPendingReplication #6293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0a7466
HDDS-10437. Rename method to getContainersPendingReplication
Feb 28, 2024
6512877
Unit test fix
Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...p-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
3 changes: 2 additions & 1 deletion ...ds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions ...dds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeDecommissionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions ...ds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions ...s/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/DecommissionStatusSubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down