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 2023/02/10 13:43:11 UTC
[pulsar] branch branch-2.10 updated (b28d796119b -> 73f66930a46)
This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a change to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from b28d796119b [fix][authorization] Fix the return value of canConsumeAsync (#19412)
new 0c7b250ffca [fix][ml] Reset individualDeletedMessagesSerializedSize after acked all messages. (#19428)
new 73f66930a46 [fix][client] Fix async completion in ConsumerImpl#processPossibleToDLQ (#19392)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java | 1 +
.../src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java | 1 +
2 files changed, 2 insertions(+)
[pulsar] 01/02: [fix][ml] Reset individualDeletedMessagesSerializedSize after acked all messages. (#19428)
Posted by xi...@apache.org.
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
commit 0c7b250ffcab7854a0dfef8ff816ec7ec0d1e503
Author: Qiang Zhao <ma...@apache.org>
AuthorDate: Sun Feb 5 22:13:35 2023 +0800
[fix][ml] Reset individualDeletedMessagesSerializedSize after acked all messages. (#19428)
(cherry picked from commit c91303daac2c59236cd931c1cacae0c105aa84ac)
---
.../main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java | 1 +
1 file changed, 1 insertion(+)
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 71948f547c2..011d3df77f1 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
@@ -2718,6 +2718,7 @@ public class ManagedCursorImpl implements ManagedCursor {
lock.readLock().lock();
try {
if (individualDeletedMessages.isEmpty()) {
+ this.individualDeletedMessagesSerializedSize = 0;
return Collections.emptyList();
}
[pulsar] 02/02: [fix][client] Fix async completion in ConsumerImpl#processPossibleToDLQ (#19392)
Posted by xi...@apache.org.
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
commit 73f66930a46b09d0bea6a9146927e84f95bd579b
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Thu Feb 2 14:07:19 2023 +0200
[fix][client] Fix async completion in ConsumerImpl#processPossibleToDLQ (#19392)
(cherry picked from commit 39dd1cda2d01a6d472b7a39115a774958a837be1)
---
.../src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
index 36a59ff14a0..3980f7b46bd 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
@@ -2006,6 +2006,7 @@ public class ConsumerImpl<T> extends ConsumerBase<T> implements ConnectionHandle
log.warn("[{}] [{}] [{}] Failed to acknowledge the message {} of the original"
+ " topic but send to the DLQ successfully.",
topicName, subscription, consumerName, finalMessageId, ex);
+ result.complete(false);
} else {
result.complete(true);
}