Skip to content

RATIS-2399. Introduce separate locks for commitIndex and snapshotIndex in RaftLogBase #1612

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

Open
Elia-Renzoni wants to merge 4 commits into
base: master
Choose a base branch
from
Open

RATIS-2399. Introduce separate locks for commitIndex and snapshotIndex in RaftLogBase #1612

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40b796f
refactor: avoid using a single lock
Elia-Renzoni Sep 24, 2026
03c63da
fix: failing tests
Elia-Renzoni Sep 25, 2026
fac0204
refactor: use a single lock and make updateSnapshotIndex lock-free
Elia-Renzoni Oct 6, 2026
55057ec
Merge commit 'ce754b99d' into refactor/avoid-single-lock
Elia-Renzoni Oct 6, 2026
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
16 changes: 4 additions & 12 deletions ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ public boolean updateCommitIndex(long majorityIndex, long currentTerm, boolean i
final long newCommitIndex = Math.min(majorityIndex, getFlushIndex());
if (oldCommittedIndex < newCommitIndex) {
if (!isLeader) {
return commitIndex.updateIncreasingly(newCommitIndex, traceIndexChange);
return commitIndex.updateToMax(newCommitIndex, traceIndexChange);
}

// Only update last committed index for current term. See §5.4.2 in paper for details.
final TermIndex entry = getTermIndex(newCommitIndex);
if (entry != null && entry.getTerm() == currentTerm) {
return commitIndex.updateIncreasingly(newCommitIndex, traceIndexChange);
return commitIndex.updateToMax(newCommitIndex, traceIndexChange);
}
}
} catch (InterruptedException e) {
Expand All @@ -153,16 +153,8 @@ protected void updateSnapshotIndexFromStateMachine() {

@Override
public void updateSnapshotIndex(long newSnapshotIndex) {
try(AutoCloseableLock writeLock = writeLock()) {
final long oldSnapshotIndex = getSnapshotIndex();
if (oldSnapshotIndex < newSnapshotIndex) {
snapshotIndex.updateIncreasingly(newSnapshotIndex, infoIndexChange);
}
final long oldCommitIndex = getLastCommittedIndex();
if (oldCommitIndex < newSnapshotIndex) {
commitIndex.updateIncreasingly(newSnapshotIndex, traceIndexChange);
}
}
snapshotIndex.updateToMax(newSnapshotIndex, infoIndexChange);
commitIndex.updateToMax(newSnapshotIndex, traceIndexChange);
}

@Override
Expand Down
Loading