You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2021/06/21 07:17:08 UTC
[pulsar] branch branch-2.7 updated: [Broker] Fix direct memory leak
in getLastMessageId (#10977)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 531da2c [Broker] Fix direct memory leak in getLastMessageId (#10977)
531da2c is described below
commit 531da2c5767115fd8cdf0bc05798542047e769c2
Author: Lari Hotari <lh...@apache.org>
AuthorDate: Mon Jun 21 10:09:41 2021 +0300
[Broker] Fix direct memory leak in getLastMessageId (#10977)
(cherry picked from commit 7417ca87e623e56454b1d812ee957ddee511a78e)
---
.../broker/service/persistent/PersistentTopic.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
index de70619..f4f6e49 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
@@ -2317,13 +2317,18 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
ledgerImpl.asyncReadEntry(position, new AsyncCallbacks.ReadEntryCallback() {
@Override
public void readEntryComplete(Entry entry, Object ctx) {
- PulsarApi.MessageMetadata metadata = Commands.parseMessageMetadata(entry.getDataBuffer());
- if (metadata.hasNumMessagesInBatch()) {
- completableFuture.complete(new BatchMessageIdImpl(position.getLedgerId(), position.getEntryId(),
- partitionIndex, metadata.getNumMessagesInBatch() - 1));
- } else {
- completableFuture
- .complete(new MessageIdImpl(position.getLedgerId(), position.getEntryId(), partitionIndex));
+ try {
+ PulsarApi.MessageMetadata metadata = Commands.parseMessageMetadata(entry.getDataBuffer());
+ if (metadata.hasNumMessagesInBatch()) {
+ completableFuture.complete(new BatchMessageIdImpl(position.getLedgerId(), position.getEntryId(),
+ partitionIndex, metadata.getNumMessagesInBatch() - 1));
+ } else {
+ completableFuture
+ .complete(new MessageIdImpl(position.getLedgerId(), position.getEntryId(),
+ partitionIndex));
+ }
+ } finally {
+ entry.release();
}
}