kaijchen commented on code in PR #845:
URL: https://github.com/apache/ratis/pull/845#discussion_r1138084517
##########
ratis-server/src/main/java/org/apache/ratis/server/impl/TransferLeadership.java:
##########
@@ -93,49 +132,76 @@ boolean isSteppingDown() {
}
void onFollowerAppendEntriesReply(LeaderStateImpl leaderState, FollowerInfo
follower) {
- final Optional<RaftPeerId> transferee = getTransferee();
// If the transferee has just append some entries and becomes up-to-date,
// send StartLeaderElection to it
- if (transferee.filter(t -> t.equals(follower.getId())).isPresent()
- && leaderState.sendStartLeaderElection(follower)) {
- LOG.info("{}: sent StartLeaderElection to transferee {} after received
AppendEntriesResponse",
- server.getMemberId(), transferee.get());
+ if (getTransferee().filter(t -> t.equals(follower.getId())).isPresent()) {
+ final String error = leaderState.sendStartLeaderElection(follower,
leaderState.getLastEntry());
+ if (error == null) {
+ LOG.info("{}: sent StartLeaderElection to transferee {} after received
AppendEntriesResponse",
+ server.getMemberId(), follower.getId());
+ }
}
}
- private void tryTransferLeadership(LeaderStateImpl leaderState, RaftPeerId
transferee) {
+ private String tryTransferLeadership(LeaderStateImpl leaderState, Context
context) {
+ final RaftPeerId transferee = context.getTransfereeId();
LOG.info("{}: start transferring leadership to {}", server.getMemberId(),
transferee);
- final LogAppender appender =
leaderState.getLogAppender(transferee).orElse(null);
-
+ final LogAppender appender = context.getTransfereeLogAppender();
if (appender == null) {
- LOG.error("{}: cannot find LogAppender for transferee {}",
server.getMemberId(), transferee);
- return;
+ return "LogAppender for transferee " + transferee + " is null";
}
final FollowerInfo follower = appender.getFollower();
- if (leaderState.sendStartLeaderElection(follower)) {
+ final String error = leaderState.sendStartLeaderElection(follower,
context.getLeaderLastEntry());
+ if (error == null) {
LOG.info("{}: sent StartLeaderElection to transferee {} immediately as
it already has up-to-date log",
server.getMemberId(), transferee);
- } else {
- LOG.info("{}: notifying LogAppender to send AppendEntries as transferee
{} is not up-to-date",
- server.getMemberId(), transferee);
+ } else if (error.contains("not up-to-date")) {
Review Comment:
There is another approach, I removed the overloaded `sendStartElection` (the
non-synchronized one).
The caller should check `isFollowerUpToDate` before calling
`sendStartElection`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
