[pulsar] branch master updated: [improve][broker] Add log on topic or subscription when enable rate limit. (#20660)

[technoboy]

This is an automated email from the ASF dual-hosted git repository.

technoboy 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 f5fd327ee7d [improve][broker] Add log on topic or subscription when 
enable rate limit. (#20660)
f5fd327ee7d is described below

commit f5fd327ee7d4cb34376fc68ec483c8958c6c76fa
Author: lifepuzzlefun <wjl_is_...@163.com>
AuthorDate: Thu Jul 13 10:01:19 2023 +0800

    [improve][broker] Add log on topic or subscription when enable rate limit. 
(#20660)
---
 .../main/java/org/apache/pulsar/broker/service/AbstractTopic.java    | 2 +-
 .../apache/pulsar/broker/service/persistent/DispatchRateLimiter.java | 4 ++--
 .../pulsar/broker/service/persistent/PersistentReplicator.java       | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
index 82706904550..90693091c89 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
@@ -1273,7 +1273,7 @@ public abstract class AbstractTopic implements Topic, 
TopicPolicyListener<TopicP
         synchronized (topicPublishRateLimiterLock) {
             PublishRate publishRate = topicPolicies.getPublishRate().get();
             if (publishRate.publishThrottlingRateInByte > 0 || 
publishRate.publishThrottlingRateInMsg > 0) {
-                log.info("Enabling publish rate limiting {} ", publishRate);
+                log.info("Enabling publish rate limiting {} on topic {}", 
publishRate, getName());
                 if (!preciseTopicPublishRateLimitingEnable) {
                     this.brokerService.setupTopicPublishRateLimiterMonitor();
                 }
diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
index b1e48035484..0650d5bc1cf 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
@@ -192,8 +192,8 @@ public class DispatchRateLimiter {
         if (type == Type.BROKER) {
             log.info("configured broker message-dispatch rate {}", 
dispatchRate);
         } else {
-            log.info("[{}] configured {} message-dispatch rate at broker {}",
-                this.topicName, type, dispatchRate);
+            log.info("[{}] configured {} message-dispatch rate at broker {} 
subscriptionName [{}]",
+                    this.topicName, type, subscriptionName == null ? "null" : 
subscriptionName, dispatchRate);
         }
         updateDispatchRate(dispatchRate);
     }
diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
index d468cb0643f..92f4b3eaf9b 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
@@ -624,8 +624,9 @@ public abstract class PersistentReplicator extends 
AbstractReplicator
     public void initializeDispatchRateLimiterIfNeeded() {
         synchronized (dispatchRateLimiterLock) {
             if (!dispatchRateLimiter.isPresent()
-                && 
DispatchRateLimiter.isDispatchRateEnabled(topic.getReplicatorDispatchRate())) {
-                this.dispatchRateLimiter = Optional.of(new 
DispatchRateLimiter(topic, Type.REPLICATOR));
+                    && 
DispatchRateLimiter.isDispatchRateEnabled(topic.getReplicatorDispatchRate())) {
+                this.dispatchRateLimiter = Optional.of(
+                        new DispatchRateLimiter(topic, 
Codec.decode(cursor.getName()), Type.REPLICATOR));
             }
         }
     }