Skip to content

HDDS-11032. Decommissioned datanodes shows up again after removing in Recon Datanodes page. #6833

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
ArafatKhan2198 merged 2 commits into from
Jun 19, 2024
Merged

HDDS-11032. Decommissioned datanodes shows up again after removing in Recon Datanodes page. #6833

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
49ab030
HDDS-11032. Ozone Recon - Decommissioned datanodes shows up again aft…
Jun 19, 2024
759fdd2
Fixed failed test cases.
Jun 19, 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
6 changes: 2 additions & 4 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/NodeEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,7 @@ private boolean preChecksSuccess(DatanodeDetails nodeByUuid, Map<String, String>
AtomicBoolean isContainerOrPipeLineOpen = new AtomicBoolean(false);
try {
nodeStatus = nodeManager.getNodeStatus(nodeByUuid);
boolean isNodeDecommissioned = nodeByUuid.getPersistedOpState() == NodeOperationalState.DECOMMISSIONED;
if (isNodeDecommissioned || nodeStatus.isDead()) {
if (nodeStatus.isDead()) {
checkContainers(nodeByUuid, isContainerOrPipeLineOpen);
if (isContainerOrPipeLineOpen.get()) {
failedNodeErrorResponseMap.put(nodeByUuid.getUuidString(), "Open Containers/Pipelines");
Expand All @@ -298,8 +297,7 @@ private boolean preChecksSuccess(DatanodeDetails nodeByUuid, Map<String, String>
LOG.error("Node : {} not found", nodeByUuid);
return false;
}
failedNodeErrorResponseMap.put(nodeByUuid.getUuidString(), "DataNode should be in either DECOMMISSIONED " +
"operational state or DEAD node state.");
failedNodeErrorResponseMap.put(nodeByUuid.getUuidString(), "DataNode should be in DEAD node status.");
return false;
}

Expand Down
9 changes: 5 additions & 4 deletions hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,9 +1281,10 @@ public void testExplicitRemovalOfDecommissionedNode() throws Exception {
(RemoveDataNodesResponseWrapper) removedDNResponse.getEntity();
DatanodesResponse errorDataNodes = removeDataNodesResponseWrapper.getDatanodesResponseMap().get("failedDatanodes");
DatanodesResponse removedNodes = removeDataNodesResponseWrapper.getDatanodesResponseMap().get("removedDatanodes");
assertEquals(1, removedNodes.getTotalCount());
assertNull(errorDataNodes);
removedNodes.getDatanodes().forEach(datanodeMetadata -> {

assertEquals(1, errorDataNodes.getTotalCount());
assertNull(removedNodes);
errorDataNodes.getDatanodes().forEach(datanodeMetadata -> {
assertEquals("host3.datanode", datanodeMetadata.getHostname());
});
}
Expand All @@ -1301,7 +1302,7 @@ public void testExplicitRemovalOfInvalidStateNode() {
assertFalse(failedNodeErrorResponseMap.isEmpty());
String nodeError = failedNodeErrorResponseMap.get(dnUUID);
assertNotNull(nodeError);
assertEquals("DataNode should be in either DECOMMISSIONED operational state or DEAD node state.", nodeError);
assertEquals("DataNode should be in DEAD node status.", nodeError);
assertEquals(Response.Status.OK.getStatusCode(), removedDNResponse.getStatus());
}

Expand Down