Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2915,6 +2915,10 @@ public String getRatisRoles() {
if (isRatisEnabled) {
try {
leaderId = omRatisServer.getLeader();
if (leaderId == null) {
LOG.error("No leader found");
return "Exception: Not a leader";
}
serviceList = getServiceList();
} catch (IOException e) {
LOG.error("IO-Exception Occurred", e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -736,13 +736,15 @@ private static Map<String, String> getOMHAConfigs(
public RaftPeer getLeader() {
try {
RaftServer.Division division = server.getDivision(raftGroupId);
if (division.getInfo().isLeader()) {
return division.getPeer();
} else {
ByteString leaderId = division.getInfo().getRoleInfoProto()
.getFollowerInfo().getLeaderInfo().getId().getId();
return leaderId.isEmpty() ? null :
division.getRaftConf().getPeer(RaftPeerId.valueOf(leaderId));
if (division != null) {
if (division.getInfo().isLeader()) {
return division.getPeer();
} else {
ByteString leaderId = division.getInfo().getRoleInfoProto()
.getFollowerInfo().getLeaderInfo().getId().getId();
return leaderId.isEmpty() ? null :
division.getRaftConf().getPeer(RaftPeerId.valueOf(leaderId));
}
}
} catch (IOException e) {
// In this case we return not a leader.
Expand Down