Skip to content

[fix][ml] Fix ManagedCursorImpl.individualDeletedMessages concurrent issue #24338

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
dao-jun merged 4 commits into from
May 23, 2025
Merged

[fix][ml] Fix ManagedCursorImpl.individualDeletedMessages concurrent issue #24338

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b0ebad
Fix ManagedCursorImpl.individualDeletedMessages concurrent issue
dao-jun May 22, 2025
9bd2394
Fix ManagedCursorImpl.individualDeletedMessages concurrent issue
dao-jun May 22, 2025
edbd379
Fix ManagedCursorImpl.individualDeletedMessages concurrent issue
dao-jun May 22, 2025
ec7277d
Fix ManagedCursorImpl.individualDeletedMessages concurrent issue
dao-jun May 22, 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
6 changes: 6 additions & 0 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 @@ -642,6 +642,7 @@ public void recoverIndividualDeletedMessages(PositionInfo positionInfo) {
recoverIndividualDeletedMessages(positionInfo.getIndividualDeletedMessagesList());
} else if (positionInfo.getIndividualDeletedMessageRangesCount() > 0) {
List<LongListMap> rangeList = positionInfo.getIndividualDeletedMessageRangesList();
lock.writeLock().lock();
try {
Map<Long, long[]> rangeMap = rangeList.stream().collect(Collectors.toMap(LongListMap::getKey,
list -> list.getValuesList().stream().mapToLong(i -> i).toArray()));
Expand All @@ -664,6 +665,8 @@ public void recoverIndividualDeletedMessages(PositionInfo positionInfo) {
} catch (Exception e) {
log.warn("[{}]-{} Failed to recover individualDeletedMessages from serialized data", ledger.getName(),
name, e);
} finally {
lock.writeLock().unlock();
}
}
}
Expand Down Expand Up @@ -3259,10 +3262,13 @@ void persistPositionToLedger(final LedgerHandle lh, MarkDeleteEntry mdEntry, fin
* and deserialization error.
*/
if (getConfig().isUnackedRangesOpenCacheSetEnabled() && getConfig().isPersistIndividualAckAsLongArray()) {
lock.readLock().lock();
try {
internalRanges = individualDeletedMessages.toRanges(getConfig().getMaxUnackedRangesToPersist());
} catch (Exception e) {
log.warn("[{}]-{} Failed to serialize individualDeletedMessages", ledger.getName(), name, e);
} finally {
lock.readLock().unlock();
}
}
if (internalRanges != null && !internalRanges.isEmpty()) {
Expand Down
Loading