Skip to content

HDDS-4832. Show Datanode OperationalState in Recon #1937

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
vivekratnavel merged 9 commits into from
Feb 24, 2021
Merged

HDDS-4832. Show Datanode OperationalState in Recon #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
29cac9e
HDDS-4832. Show Datanode OperationalState in Recon
smengcl Feb 19, 2021
a438e3a
Rename Status -> State to keep consistent with internal names.
smengcl Feb 19, 2021
52c7d60
status -> state.
smengcl Feb 19, 2021
7c1b6c8
Update UT.
smengcl Feb 19, 2021
6966a58
Fix UT. Order of datanodes in the response is random
smengcl Feb 20, 2021
73033e1
Use exclamation-circle for DECOMMISSIONED and IN_MAINTENANCE.
smengcl Feb 22, 2021
80dbf26
Use warning / outlined for DECOMMISSIONED / IN_MAINTENANCE.
smengcl Feb 23, 2021
08a81aa
Use icon-warning. And using outlined for all Operational State icons.
smengcl Feb 23, 2021
2033b57
Update db.json for mock server.
smengcl Feb 23, 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
3 changes: 3 additions & 0 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 @@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.recon.api;

import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState;
import org.apache.hadoop.hdds.scm.container.placement.metrics.SCMNodeStat;
import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException;
Expand Down Expand Up @@ -85,6 +86,7 @@ public Response getDatanodes() {
} catch (NodeNotFoundException e) {
LOG.warn("Cannot get nodeState for datanode {}", datanode, e);
}
final NodeOperationalState nodeOpState = datanode.getPersistedOpState();
String hostname = datanode.getHostName();
Set<PipelineID> pipelineIDs = nodeManager.getPipelines(datanode);
List<DatanodePipeline> pipelines = new ArrayList<>();
Expand Down Expand Up @@ -123,6 +125,7 @@ public Response getDatanodes() {
.withDatanodeStorageReport(storageReport)
.withLastHeartbeat(nodeManager.getLastHeartbeat(datanode))
.withState(nodeState)
.withOperationalState(nodeOpState)
.withPipelines(pipelines)
.withLeaderCount(leaderCount.get())
.withUUid(datanode.getUuidString())
Expand Down
15 changes: 15 additions & 0 deletions ...p-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/DatanodeMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.recon.api.types;

import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalState;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState;

import javax.xml.bind.annotation.XmlAccessType;
Expand All @@ -40,6 +41,9 @@ public final class DatanodeMetadata {
@XmlElement(name = "state")
private NodeState state;

@XmlElement(name = "opState")
private NodeOperationalState opState;

@XmlElement(name = "lastHeartbeat")
private long lastHeartbeat;

Expand Down Expand Up @@ -71,6 +75,7 @@ private DatanodeMetadata(Builder builder) {
this.hostname = builder.hostname;
this.uuid = builder.uuid;
this.state = builder.state;
this.opState = builder.opState;
this.lastHeartbeat = builder.lastHeartbeat;
this.datanodeStorageReport = builder.datanodeStorageReport;
this.pipelines = builder.pipelines;
Expand All @@ -90,6 +95,10 @@ public NodeState getState() {
return state;
}

public NodeOperationalState getOperationalState() {
return opState;
}

public long getLastHeartbeat() {
return lastHeartbeat;
}
Expand Down Expand Up @@ -147,6 +156,7 @@ public static final class Builder {
private String hostname;
private String uuid;
private NodeState state;
private NodeOperationalState opState;
private long lastHeartbeat;
private DatanodeStorageReport datanodeStorageReport;
private List<DatanodePipeline> pipelines;
Expand All @@ -172,6 +182,11 @@ public Builder withState(NodeState state) {
return this;
}

public Builder withOperationalState(NodeOperationalState opState) {
this.opState = opState;
return this;
}

public Builder withLastHeartbeat(long lastHeartbeat) {
this.lastHeartbeat = lastHeartbeat;
return this;
Expand Down
Loading