This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 4213307637 HDDS-12648. Fix checkLeaderStatus in removeOMFromRatisRing
and addOMToRatisRing (#8142)
4213307637 is described below
commit 42133076373dd3c1b72f0f8028771166a0594b50
Author: Peter Lee <[email protected]>
AuthorDate: Sat Mar 29 14:09:56 2025 +0800
HDDS-12648. Fix checkLeaderStatus in removeOMFromRatisRing and
addOMToRatisRing (#8142)
---
.../apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java | 2 +-
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 6 +++---
.../org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java | 4 +---
.../protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java | 2 +-
.../src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java | 2 +-
5 files changed, 7 insertions(+), 9 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java
index 49bc7e0a3c..87faa57507 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAWithAllRunning.java
@@ -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 =
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 5200848485..ec332f3a83 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -3170,7 +3170,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);
@@ -4333,7 +4333,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;
}
/**
@@ -4344,7 +4344,7 @@ public boolean isLeaderReady() {
public void checkLeaderStatus() throws OMNotLeaderException,
OMLeaderNotReadyException {
OzoneManagerRatisServer.RaftServerStatus raftServerStatus =
- omRatisServer.checkLeaderStatus();
+ omRatisServer.getLeaderStatus();
RaftPeerId raftPeerId = omRatisServer.getRaftPeerId();
switch (raftServerStatus) {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
index d90c5ffce4..afa3151a8c 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
@@ -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);
@@ -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);
@@ -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;
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
index 6b7bccd4ab..1cf6c1d569 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
@@ -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);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java
index bbe6decd87..c2cf77fb80 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/OmTestManagers.java
@@ -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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
