Skip to content

RATIS-2283. GrpcLogAppender Thread Restart Leaves catchup=false, Blocking Reconfiguration Progress #1250

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
szetszwo merged 2 commits into from
Apr 23, 2025
Merged

RATIS-2283. GrpcLogAppender Thread Restart Leaves catchup=false, Blocking Reconfiguration Progress #1250

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
aa0ddf7
modify the checking rule for shouldInstallSnapshot()
RkGrit Apr 17, 2025
ed3da9a
modify isFollowerBootstrapping and isBootStrappingPeer
RkGrit Apr 23, 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 ratis-server-api/src/main/java/org/apache/ratis/server/leader/LogAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ default SnapshotInfo shouldInstallSnapshot() {
// we should install snapshot if the follower needs to catch up and:
// 1. there is no local log entry but there is snapshot
// 2. or the follower's next index is smaller than the log start index
// 3. or the follower is bootstrapping and has not installed any snapshot yet
// 3. or the follower is bootstrapping (i.e. not yet caught up) and has not installed any snapshot yet
final FollowerInfo follower = getFollower();
final boolean isFollowerBootstrapping = getLeaderState().isFollowerBootstrapping(follower);
final SnapshotInfo snapshot = getServer().getStateMachine().getLatestSnapshot();
Expand Down
11 changes: 9 additions & 2 deletions ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,9 @@ public void onFollowerSuccessAppendEntries(FollowerInfo follower) {

@Override
public boolean isFollowerBootstrapping(FollowerInfo follower) {
return isBootStrappingPeer(follower.getId());
// It is better to check caught up than staging state
// since a follower may have already caught up but still in the staging state.
return !isCaughtUp(follower);
}

private void checkStaging() {
Expand Down Expand Up @@ -852,7 +854,12 @@ private void checkStaging() {
}

boolean isBootStrappingPeer(RaftPeerId peerId) {
return Optional.ofNullable(stagingState).map(s -> s.contains(peerId)).orElse(false);
final Optional<LogAppender> info = getLogAppender(peerId);
if (info.isPresent()) {
return !isCaughtUp(info.get().getFollower());
}
final ConfigurationStagingState staging = stagingState;
return staging != null && staging.contains(peerId);
}

void submitUpdateCommitEvent() {
Expand Down
Loading