Skip to content

RATIS-2166. Update nextChunkIndex when snapshot is ALREADY_INSTALLED #1159

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
Oct 9, 2024
Merged

RATIS-2166. Update nextChunkIndex when snapshot is ALREADY_INSTALLED #1159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79dd219
fix not update chunk_index
133tosakarin Sep 30, 2024
44a687f
change assert to throw IOException
133tosakarin Oct 9, 2024
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
8 changes: 6 additions & 2 deletions ratis-server/src/main/java/org/apache/ratis/server/impl/SnapshotInstallationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,19 @@ private InstallSnapshotReplyProto checkAndInstallSnapshot(InstallSnapshotRequest
// considering a follower peer requiring a snapshot installation does not
// have a lot of requests
if (state.getLog().getLastCommittedIndex() >= lastIncludedIndex) {
nextChunkIndex.set(snapshotChunkRequest.getRequestIndex() + 1);
return toInstallSnapshotReplyProto(leaderId, getMemberId(),
currentTerm, snapshotChunkRequest.getRequestIndex(), InstallSnapshotResult.ALREADY_INSTALLED);
}

//TODO: We should only update State with installed snapshot once the request is done.
state.installSnapshot(request);

int idx = nextChunkIndex.getAndIncrement();
Preconditions.assertEquals(snapshotChunkRequest.getRequestIndex(), idx, "nextChunkIndex");
final int expectedChunkIndex = nextChunkIndex.getAndIncrement();
if (expectedChunkIndex != snapshotChunkRequest.getRequestIndex()) {
throw new IOException("Unexpected request chunk index: " + snapshotChunkRequest.getRequestIndex()
+ " (the expected index is " + expectedChunkIndex + ")");
}
// update the committed index
// re-load the state machine if this is the last chunk
if (snapshotChunkRequest.getDone()) {
Expand Down