Skip to content

HDDS-12648. Fix checkLeaderStatus in removeOMFromRatisRing and addOMToRatisRing #8142

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
adoroszlai merged 2 commits into from
Mar 29, 2025
Merged

HDDS-12648. Fix checkLeaderStatus in removeOMFromRatisRing and addOMToRatisRing #8142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ebd592
HDDS-12648. Fix checkLeaderStatus in removeOMFromRatisRing and addOMT…
peterxcli Mar 23, 2025
8defe1e
Rename checkLeaderStatus to getLeaderStatus in OzoneManagerRatisServer
peterxcli Mar 29, 2025
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
2 changes: 1 addition & 1 deletion ...ation-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ public void testFailoverWithSuggestedLeader() throws Exception {
}
}
assertNotNull(followerOM);
assertSame(followerOM.getOmRatisServer().checkLeaderStatus(),
assertSame(followerOM.getOmRatisServer().getLeaderStatus(),
OzoneManagerRatisServer.RaftServerStatus.NOT_LEADER);

OzoneManagerProtocolProtos.OMRequest writeRequest =
Expand Down
6 changes: 3 additions & 3 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 @@ -3051,7 +3051,7 @@ public List<List<String>> getRatisRoles() {
if (null == omRatisServer) {
return getRatisRolesException("Server is shutting down");
}
String leaderReadiness = omRatisServer.checkLeaderStatus().name();
String leaderReadiness = omRatisServer.getLeaderStatus().name();
final RaftPeerId leaderId = omRatisServer.getLeaderId();
if (leaderId == null) {
LOG.error(NO_LEADER_ERROR_MESSAGE);
Expand Down Expand Up @@ -4214,7 +4214,7 @@ public long getMaxUserVolumeCount() {
*/
public boolean isLeaderReady() {
final OzoneManagerRatisServer ratisServer = omRatisServer;
return ratisServer != null && ratisServer.checkLeaderStatus() == LEADER_AND_READY;
return ratisServer != null && ratisServer.getLeaderStatus() == LEADER_AND_READY;
}

/**
Expand All @@ -4225,7 +4225,7 @@ public boolean isLeaderReady() {
public void checkLeaderStatus() throws OMNotLeaderException,
OMLeaderNotReadyException {
OzoneManagerRatisServer.RaftServerStatus raftServerStatus =
omRatisServer.checkLeaderStatus();
omRatisServer.getLeaderStatus();
RaftPeerId raftPeerId = omRatisServer.getRaftPeerId();

switch (raftServerStatus) {
Expand Down
4 changes: 1 addition & 3 deletions ...ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ public void addOMToRatisRing(OMNodeDetails newOMNode) throws IOException {
final List<RaftPeer> newPeersList = new ArrayList<>(raftPeerMap.values());
newPeersList.add(newRaftPeer);

checkLeaderStatus();
SetConfigurationRequest request = new SetConfigurationRequest(clientId,
server.getId(), raftGroupId, nextCallId(), newPeersList);

Expand Down Expand Up @@ -390,7 +389,6 @@ public void removeOMFromRatisRing(OMNodeDetails removeOMNode)
.map(Map.Entry::getValue)
.collect(Collectors.toList());

checkLeaderStatus();
SetConfigurationRequest request = new SetConfigurationRequest(clientId,
server.getId(), raftGroupId, nextCallId(), newPeersList);

Expand Down Expand Up @@ -829,7 +827,7 @@ public enum RaftServerStatus {
*
* @return RaftServerStatus.
*/
public RaftServerStatus checkLeaderStatus() {
public RaftServerStatus getLeaderStatus() {
final RaftServer.Division division = getServerDivision();
if (division == null) {
return RaftServerStatus.NOT_LEADER;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public OMRequest getLastRequestToSubmit() {
private OMResponse submitReadRequestToOM(OMRequest request)
throws ServiceException {
// Check if this OM is the leader.
RaftServerStatus raftServerStatus = omRatisServer.checkLeaderStatus();
RaftServerStatus raftServerStatus = omRatisServer.getLeaderStatus();
if (raftServerStatus == LEADER_AND_READY ||
request.getCmdType().equals(PrepareStatus)) {
return handler.handleReadRequest(request);
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public OmTestManagers(OzoneConfiguration conf,
"scmTopologyClient", scmTopologyClient);

om.start();
waitFor(() -> om.getOmRatisServer().checkLeaderStatus() == RaftServerStatus.LEADER_AND_READY,
waitFor(() -> om.getOmRatisServer().getLeaderStatus() == RaftServerStatus.LEADER_AND_READY,
10, 10_000);

rpcClient = OzoneClientFactory.getRpcClient(conf);
Expand Down