You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by te...@apache.org on 2023/02/08 07:26:37 UTC
[pulsar] branch branch-2.11 updated: [fix][broker] In the trimDeletedEntries method, release the removed entry (#18305)
This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new 903a71947f3 [fix][broker] In the trimDeletedEntries method, release the removed entry (#18305)
903a71947f3 is described below
commit 903a71947f342ac2ffa83f6fa0f411e48a8b4b92
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)
---
.../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 514dd24fa4d..c6f0dcdaafc 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
@@ -3265,8 +3265,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 5b8476d244a..cdc493b51ab 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
@@ -2668,6 +2668,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)