This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.9 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 62b4c60b4b01805ee3b374170d20333a8e6bac1d Author: baomingyu <[email protected]> AuthorDate: Fri Jan 7 12:51:41 2022 +0800 Fix issues 11964, deadlock bug when use key_shared mode (#11965) (cherry picked from commit fd3ba55f8e39992ecbc96830af5ee58e3247a25a) --- .../java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java index 3d382ad..2f9578c 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java @@ -1993,7 +1993,6 @@ public class ManagedCursorImpl implements ManagedCursor { if (individualDeletedMessages.isEmpty()) { // No changes to individually deleted messages, so nothing to do at this point - callback.deleteComplete(ctx); return; } @@ -2025,6 +2024,9 @@ public class ManagedCursorImpl implements ManagedCursor { return; } finally { lock.writeLock().unlock(); + if (individualDeletedMessages.isEmpty()) { + callback.deleteComplete(ctx); + } } // Apply rate limiting to mark-delete operations
