Skip to content

HDDS-10918. NPE in OM when OM leader transfers #6735

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 1 commit into from
Jun 1, 2024
Merged

HDDS-10918. NPE in OM when OM leader transfers #6735

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions ...zone/common/src/main/java/org/apache/hadoop/ozone/om/exceptions/OMNotLeaderException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ public OMNotLeaderException(RaftPeerId currentPeerId,
this.leaderAddress = suggestedLeaderAddress;
}

public OMNotLeaderException(String msg) {
super(msg);
this.currentPeerId = null;
this.leaderPeerId = null;
this.leaderAddress = null;
}

public String getSuggestedLeaderNodeId() {
return leaderPeerId;
}
Expand Down
6 changes: 6 additions & 0 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 @@ -72,6 +72,7 @@
import org.apache.ratis.protocol.ClientId;
import org.apache.ratis.protocol.SetConfigurationRequest;
import org.apache.ratis.protocol.exceptions.LeaderNotReadyException;
import org.apache.ratis.protocol.exceptions.LeaderSteppingDownException;
import org.apache.ratis.protocol.exceptions.NotLeaderException;
import org.apache.ratis.protocol.exceptions.StateMachineException;
import org.apache.ratis.protocol.Message;
Expand Down Expand Up @@ -495,6 +496,11 @@ private OMResponse createOmResponseImpl(OMRequest omRequest,
leaderNotReadyException.getMessage()));
}

LeaderSteppingDownException leaderSteppingDownException = reply.getLeaderSteppingDownException();
if (leaderSteppingDownException != null) {
throw new ServiceException(new OMNotLeaderException(leaderSteppingDownException.getMessage()));
}

StateMachineException stateMachineException =
reply.getStateMachineException();
if (stateMachineException != null) {
Expand Down