You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by xi...@apache.org on 2022/12/14 02:53:46 UTC
[pulsar] branch branch-2.10 updated: [fix][broker] In the trimDeletedEntries method, release the removed entry (#18305)
This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 4eb93ec94fe [fix][broker] In the trimDeletedEntries method, release the removed entry (#18305)
4eb93ec94fe is described below
commit 4eb93ec94febe38d0a382fd226461352edca8f6e
Author: LinChen <15...@qq.com>
AuthorDate: Thu Nov 3 20:51:18 2022 +0800
[fix][broker] In the trimDeletedEntries method, release the removed entry (#18305)
(cherry picked from commit 79a3f850c560bc2a8e27940c81ce5b492bf8f2c8)
---
.../org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java | 10 ++++++++--
.../org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java | 5 +++++
2 files changed, 13 insertions(+), 2 deletions(-)
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 62070a076cf..9a83ed47f45 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
@@ -3177,8 +3177,14 @@ public class ManagedCursorImpl implements ManagedCursor {
@Override
public void trimDeletedEntries(List<Entry> entries) {
- entries.removeIf(entry -> ((PositionImpl) entry.getPosition()).compareTo(markDeletePosition) <= 0
- || individualDeletedMessages.contains(entry.getLedgerId(), entry.getEntryId()));
+ entries.removeIf(entry -> {
+ boolean isDeleted = ((PositionImpl) entry.getPosition()).compareTo(markDeletePosition) <= 0
+ || individualDeletedMessages.contains(entry.getLedgerId(), entry.getEntryId());
+ if (isDeleted) {
+ entry.release();
+ }
+ return isDeleted;
+ });
}
private ManagedCursorImpl cursorImpl() {
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
index e6c460675ab..99d16f0f91f 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
@@ -2495,6 +2495,11 @@ public class ManagedCursorTest extends MockedBookKeeperTestCase {
assertEquals(entries.size(), 1);
assertEquals(entries.get(0).getPosition(), PositionImpl.get(markDeletedPosition.getLedgerId(),
markDeletedPosition.getEntryId() + 7));
+
+ assertEquals(entry1.refCnt(), 0);
+ assertEquals(entry2.refCnt(), 0);
+ assertEquals(entry3.refCnt(), 0);
+ assertEquals(entry4.refCnt(), 0);
}
@Test(timeOut = 20000)