You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ti...@apache.org on 2022/12/10 14:10:16 UTC
[pulsar] branch master updated: [improve][broker] GetMessageById add RedeliveryCount for output (#15095)
This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 95218727922 [improve][broker] GetMessageById add RedeliveryCount for output (#15095)
95218727922 is described below
commit 952187279227fbf46af0f68d31ede1f5567e8075
Author: Lei Zhiyuan <le...@gmail.com>
AuthorDate: Sat Dec 10 22:10:09 2022 +0800
[improve][broker] GetMessageById add RedeliveryCount for output (#15095)
Co-authored-by: tison <wa...@gmail.com>
---
.../src/main/java/org/apache/pulsar/broker/service/Consumer.java | 4 ++--
.../src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
index 494327ef28d..47da95b34ac 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
@@ -352,9 +352,9 @@ public class Consumer {
return writeAndFlushPromise;
}
- private void incrementUnackedMessages(int ackedMessages) {
+ private void incrementUnackedMessages(int unackedMessages) {
if (Subscription.isIndividualAckMode(subType)
- && addAndGetUnAckedMsgs(this, ackedMessages) >= getMaxUnackedMessages()
+ && addAndGetUnAckedMsgs(this, unackedMessages) >= getMaxUnackedMessages()
&& getMaxUnackedMessages() > 0) {
blockedConsumerOnUnackedMsgs = true;
}
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
index 60aa6497378..eb8bee3bb84 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
@@ -1321,6 +1321,7 @@ public class CmdTopics extends CmdBase {
System.out.println("Publish time: " + message.getPublishTime());
System.out.println("Event time: " + message.getEventTime());
+ System.out.println("Redelivery count: " + message.getRedeliveryCount());
if (message.getDeliverAtTime() != 0) {
System.out.println("Deliver at time: " + message.getDeliverAtTime());