Skip to content

HDDS-4867. Ozone admin datanode list should report dead and stale nodes #1966

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 3 commits into from
Mar 1, 2021
Merged

HDDS-4867. Ozone admin datanode list should report dead and stale nodes #1966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e28b032
Initial changes
Feb 25, 2021
2d11139
Swith to inline comparator
Feb 25, 2021
2e4742f
Fixed checkstyle
Feb 26, 2021
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
4 changes: 3 additions & 1 deletion ...-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,13 @@ public void execute(ScmClient scmClient) throws IOException {
private List<DatanodeWithAttributes> getAllNodes(ScmClient scmClient)
throws IOException {
List<HddsProtos.Node> nodes = scmClient.queryNode(null,
HddsProtos.NodeState.HEALTHY, HddsProtos.QueryScope.CLUSTER, "");
null, HddsProtos.QueryScope.CLUSTER, "");

return nodes.stream()
.map(p -> new DatanodeWithAttributes(
DatanodeDetails.getFromProtoBuf(p.getNodeID()),
p.getNodeOperationalStates(0), p.getNodeStates(0)))
.sorted((o1, o2) -> o1.healthState.compareTo(o2.healthState))
.collect(Collectors.toList());
}

Expand Down Expand Up @@ -114,6 +115,7 @@ private void printDatanodeInfo(DatanodeWithAttributes dna) {
+ "/" + datanode.getHostName() + "/" + relatedPipelineNum +
" pipelines)");
System.out.println("Operational State: " + dna.getOpState());
System.out.println("Health State: " + dna.getHealthState());
System.out.println("Related pipelines:\n" + pipelineListInfo);
}

Expand Down
24 changes: 20 additions & 4 deletions ...s/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ public void tearDown() {
}

@Test
public void testDataNodeOperationalStateIncludedInOutput() throws Exception {
public void testDataNodeOperationalStateAndHealthIncludedInOutput()
throws Exception {
ScmClient scmClient = mock(ScmClient.class);
Mockito.when(scmClient.queryNode(any(HddsProtos.NodeOperationalState.class),
any(HddsProtos.NodeState.class), any(HddsProtos.QueryScope.class),
Expand All @@ -89,12 +90,22 @@ public void testDataNodeOperationalStateIncludedInOutput() throws Exception {
"^Operational State:\\s+DECOMMISSIONING$", Pattern.MULTILINE);
m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
for (HddsProtos.NodeState state : HddsProtos.NodeState.values()) {
p = Pattern.compile(
"^Health State:\\s+"+state+"$", Pattern.MULTILINE);
m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
}
// Ensure the nodes are ordered by health state HEALTHY, STALE, DEAD
p = Pattern.compile(".+HEALTHY.+STALE.+DEAD.+", Pattern.DOTALL);
m = p.matcher(outContent.toString(DEFAULT_ENCODING));
assertTrue(m.find());
}

private List<HddsProtos.Node> getNodeDetails() {
List<HddsProtos.Node> nodes = new ArrayList<>();

for (int i=0; i<2; i++) {
for (int i=0; i<3; i++) {
HddsProtos.DatanodeDetailsProto.Builder dnd =
HddsProtos.DatanodeDetailsProto.newBuilder();
dnd.setHostName("host" + i);
Expand All @@ -109,11 +120,16 @@ private List<HddsProtos.Node> getNodeDetails() {
if (i == 0) {
builder.addNodeOperationalStates(
HddsProtos.NodeOperationalState.IN_SERVICE);
} else {
builder.addNodeStates(HddsProtos.NodeState.STALE);
} else if (i == 1) {
builder.addNodeOperationalStates(
HddsProtos.NodeOperationalState.DECOMMISSIONING);
builder.addNodeStates(HddsProtos.NodeState.DEAD);
} else {
builder.addNodeOperationalStates(
HddsProtos.NodeOperationalState.IN_SERVICE);
builder.addNodeStates(HddsProtos.NodeState.HEALTHY);
}
builder.addNodeStates(HddsProtos.NodeState.HEALTHY);
builder.setNodeID(dnd.build());
nodes.add(builder.build());
}
Expand Down