Skip to content

Fix race condition in skipEntries that moves readPosition and markDeletePosition incorrectly #1478

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
merlimat merged 1 commit into from
Mar 31, 2018
Merged

Fix race condition in skipEntries that moves readPosition and markDeletePosition incorrectly #1478

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
25 changes: 13 additions & 12 deletions managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,18 +1245,6 @@ PositionImpl setAcknowledgedPosition(PositionImpl newMarkDeletePosition) {
throw new IllegalArgumentException("Mark deleting an already mark-deleted position");
}

if (readPosition.compareTo(newMarkDeletePosition) <= 0) {
// If the position that is mark-deleted is past the read position, it
// means that the client has skipped some entries. We need to move
// read position forward
PositionImpl oldReadPosition = readPosition;
readPosition = ledger.getNextValidPosition(newMarkDeletePosition);

if (log.isDebugEnabled()) {
log.debug("[{}] Moved read position from: {} to: {}", ledger.getName(), oldReadPosition, readPosition);
}
}

PositionImpl oldMarkDeletePosition = markDeletePosition;

if (!newMarkDeletePosition.equals(oldMarkDeletePosition)) {
Expand Down Expand Up @@ -1285,6 +1273,19 @@ PositionImpl setAcknowledgedPosition(PositionImpl newMarkDeletePosition) {
// markDelete-position and clear out deletedMsgSet
markDeletePosition = PositionImpl.get(newMarkDeletePosition);
individualDeletedMessages.remove(Range.atMost(markDeletePosition));

if (readPosition.compareTo(newMarkDeletePosition) <= 0) {
// If the position that is mark-deleted is past the read position, it
// means that the client has skipped some entries. We need to move
// read position forward
PositionImpl oldReadPosition = readPosition;
readPosition = ledger.getNextValidPosition(newMarkDeletePosition);

if (log.isDebugEnabled()) {
log.debug("[{}] Moved read position from: {} to: {}, and new mark-delete position {}", ledger.getName(),
oldReadPosition, readPosition, markDeletePosition);
}
}

return newMarkDeletePosition;
}
Expand Down