Skip to content

HDDS-14966. OM UI shows wrong Leader Readiness values #10036

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

Open
Russole wants to merge 4 commits into
base: master
Choose a base branch
from
+26 −15
Open

HDDS-14966. OM UI shows wrong Leader Readiness values #10036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86227e3
HDDS-14966. SCM Web UI Leader Readiness column does not appear to be …
Russole Apr 3, 2026
fd69796
Replace OM role strings with RaftPeerRole enum
Russole Apr 3, 2026
3cd9499
Update patch based on review comment
Russole Apr 19, 2026
b1de8b8
Fix CheckStyle Error
Russole Apr 19, 2026
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
34 changes: 21 additions & 13 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,28 +1077,36 @@ public static String getOMAddressListPrintString(List<OMNodeDetails> omList) {
public static boolean isBucketSnapshotIndicator(String key) {
return key.startsWith(OM_SNAPSHOT_INDICATOR) && key.split("/").length == 2;
}

public static List<List<String>> format(
List<ServiceInfo> nodes, int port, String leaderId, String leaderReadiness) {
List<ServiceInfo> nodes, int port, String leaderId,
String localNodeId, String localLeaderStatus) {
List<List<String>> omInfoList = new ArrayList<>();
// Ensuring OM's are printed in correct order
List<ServiceInfo> omNodes = nodes.stream()
.filter(node -> node.getNodeType() == HddsProtos.NodeType.OM)
.sorted(Comparator.comparing(ServiceInfo::getHostname))
.collect(Collectors.toList());
for (ServiceInfo info : omNodes) {
// Printing only the OM's running
if (info.getNodeType() == HddsProtos.NodeType.OM) {
String role = info.getOmRoleInfo().getNodeId().equals(leaderId)
? "LEADER" : "FOLLOWER";
List<String> omInfo = new ArrayList<>();
omInfo.add(info.getHostname());
omInfo.add(info.getOmRoleInfo().getNodeId());
omInfo.add(String.valueOf(port));
omInfo.add(role);
omInfo.add(leaderReadiness);
omInfoList.add(omInfo);
String nodeId = info.getOmRoleInfo().getNodeId();
boolean isLeaderNode = nodeId.equals(leaderId);
boolean isLocalNode = nodeId.equals(localNodeId);
String role = info.getOmRoleInfo().getServerRole();

String displayValue;
if (isLeaderNode && isLocalNode) {
displayValue = localLeaderStatus;
} else {
displayValue = role;
}

List<String> omInfo = new ArrayList<>();
omInfo.add(info.getHostname());
omInfo.add(nodeId);
omInfo.add(String.valueOf(port));
omInfo.add(role);
omInfo.add(displayValue);
omInfoList.add(omInfo);
}
return omInfoList;
}
Expand Down
7 changes: 5 additions & 2 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3217,7 +3217,9 @@ public List<List<String>> getRatisRoles() {
if (null == omRatisServer) {
return getRatisRolesException("Server is shutting down");
}
String leaderReadiness = omRatisServer.getLeaderStatus().name();

String localLeaderStatus = omRatisServer.getLeaderStatus().name();
String localNodeId = omNodeDetails.getNodeId();
final RaftPeerId leaderId = omRatisServer.getLeaderId();
if (leaderId == null) {
LOG.error(NO_LEADER_ERROR_MESSAGE);
Expand All @@ -3231,7 +3233,8 @@ public List<List<String>> getRatisRoles() {
LOG.error("Failed to getServiceList", e);
return getRatisRolesException("IO-Exception Occurred, " + e.getMessage());
}
return OmUtils.format(serviceList, port, leaderId.toString(), leaderReadiness);
return OmUtils.format(serviceList, port, leaderId.toString(),
localNodeId, localLeaderStatus);
}

/**
Expand Down