Skip to content

HDDS-13831. Refine set role logic in getServicelist #9191

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
ivandika3 merged 1 commit into from
Oct 31, 2025
Merged

HDDS-13831. Refine set role logic in getServicelist #9191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 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 @@ -3301,12 +3301,24 @@ public List<ServiceInfo> getServiceList() throws IOException {
.build());
}

// Since this OM is processing the request, we can assume it to be the
// leader OM

RaftPeerRole selfRole;
RaftPeerId leaderId = null;
if (omRatisServer == null) {
selfRole = RaftPeerRole.LEADER;
} else {
leaderId = omRatisServer.getLeaderId();
RaftPeerId selfPeerId = omRatisServer.getRaftPeerId();
if (leaderId != null && leaderId.equals(selfPeerId)) {
selfRole = RaftPeerRole.LEADER;
} else if (omNodeDetails.isRatisListener()) {
selfRole = RaftPeerRole.LISTENER;
} else {
selfRole = RaftPeerRole.FOLLOWER;
}
}
OMRoleInfo omRole = OMRoleInfo.newBuilder()
.setNodeId(getOMNodeId())
.setServerRole(RaftPeerRole.LEADER.name())
.setServerRole(selfRole.name())
.build();
omServiceInfoBuilder.setOmRoleInfo(omRole);

Expand All @@ -3330,10 +3342,17 @@ public List<ServiceInfo> getServiceList() throws IOException {
.setValue(peerNode.getRpcPort())
.build());

String role = peerNode.isRatisListener() ? RaftPeerRole.LISTENER.name() : RaftPeerRole.FOLLOWER.name();
RaftPeerRole roleForPeer;
if (leaderId != null && peerNode.getNodeId().equals(leaderId.toString())) {
roleForPeer = RaftPeerRole.LEADER;
} else if (peerNode.isRatisListener()) {
roleForPeer = RaftPeerRole.LISTENER;
} else {
roleForPeer = RaftPeerRole.FOLLOWER;
}
OMRoleInfo peerOmRole = OMRoleInfo.newBuilder()
.setNodeId(peerNode.getNodeId())
.setServerRole(role)
.setServerRole(roleForPeer.name())
.build();
peerOmServiceInfoBuilder.setOmRoleInfo(peerOmRole);

Expand Down