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/05/29 14:48:47 UTC
[pulsar] branch branch-2.11 updated: [improve] [broker] Avoid `PersistentSubscription.expireMessages` logic check backlog twice. (#20416)
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 70b4462cb52 [improve] [broker] Avoid `PersistentSubscription.expireMessages` logic check backlog twice. (#20416)
70b4462cb52 is described below
commit 70b4462cb526fa177acc91113cb01488f12b68d4
Author: lifepuzzlefun <wj...@163.com>
AuthorDate: Mon May 29 22:11:28 2023 +0800
[improve] [broker] Avoid `PersistentSubscription.expireMessages` logic check backlog twice. (#20416)
---
.../pulsar/broker/service/persistent/PersistentSubscription.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
index 645f7402c7e..1a97b9f784a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
@@ -1052,8 +1052,9 @@ public class PersistentSubscription extends AbstractSubscription implements Subs
@Override
public boolean expireMessages(int messageTTLInSeconds) {
- if ((getNumberOfEntriesInBacklog(false) == 0) || (dispatcher != null && dispatcher.isConsumerConnected()
- && getNumberOfEntriesInBacklog(false) < MINIMUM_BACKLOG_FOR_EXPIRY_CHECK
+ long backlog = getNumberOfEntriesInBacklog(false);
+ if (backlog == 0 || (dispatcher != null && dispatcher.isConsumerConnected()
+ && backlog < MINIMUM_BACKLOG_FOR_EXPIRY_CHECK
&& !topic.isOldestMessageExpired(cursor, messageTTLInSeconds))) {
// don't do anything for almost caught-up connected subscriptions
return false;