You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/05/11 07:38:23 UTC
[pulsar] branch master updated: [cleanup][broker] Override close method to avoid caching exception (#15529)
This is an automated email from the ASF dual-hosted git repository.
penghui 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 526979a87e3 [cleanup][broker] Override close method to avoid caching exception (#15529)
526979a87e3 is described below
commit 526979a87e3cea5c4c90667ce86aed52927fd631
Author: Jiwei Guo <te...@apache.org>
AuthorDate: Wed May 11 15:38:15 2022 +0800
[cleanup][broker] Override close method to avoid caching exception (#15529)
---
.../main/java/org/apache/pulsar/broker/service/AbstractTopic.java | 4 +---
.../java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java | 2 +-
.../java/org/apache/pulsar/broker/service/PublishRateLimiter.java | 5 +++++
.../org/apache/pulsar/broker/service/PublishRateLimiterDisable.java | 2 +-
.../org/apache/pulsar/broker/service/PublishRateLimiterImpl.java | 2 +-
.../pulsar/broker/service/nonpersistent/NonPersistentTopic.java | 6 +-----
.../apache/pulsar/broker/service/persistent/PersistentTopic.java | 6 +-----
7 files changed, 11 insertions(+), 16 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 2c0d8841008..448cc6653a3 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
@@ -1051,9 +1051,7 @@ public abstract class AbstractTopic implements Topic, TopicPolicyListener<TopicP
}
// attach the resource-group level rate limiters, if set
- String rgName = policies.resource_group_name != null
- ? policies.resource_group_name
- : null;
+ String rgName = policies.resource_group_name;
if (rgName != null) {
final ResourceGroup resourceGroup =
brokerService.getPulsar().getResourceGroupServiceManager().resourceGroupGet(rgName);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java
index e61597e2d13..67cc46d95fa 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java
@@ -133,7 +133,7 @@ public class PrecisPublishLimiter implements PublishRateLimiter {
}
@Override
- public void close() throws Exception {
+ public void close() {
rateLimitFunction.apply();
replaceLimiters(null);
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiter.java
index 397887978b2..931f35cfa1b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiter.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiter.java
@@ -71,4 +71,9 @@ public interface PublishRateLimiter extends AutoCloseable {
* @param bytes
*/
boolean tryAcquire(int numbers, long bytes);
+
+ /**
+ * Close the limiter.
+ */
+ void close();
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterDisable.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterDisable.java
index 81c4b82317f..72c8132128e 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterDisable.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterDisable.java
@@ -63,7 +63,7 @@ public class PublishRateLimiterDisable implements PublishRateLimiter {
}
@Override
- public void close() throws Exception {
+ public void close() {
// No-op
}
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterImpl.java
index 0e1200edc31..f1646684b82 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterImpl.java
@@ -110,7 +110,7 @@ public class PublishRateLimiterImpl implements PublishRateLimiter {
}
@Override
- public void close() throws Exception {
+ public void close() {
// no-op
}
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
index b7422bca962..045ad47968d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
@@ -491,11 +491,7 @@ public class NonPersistentTopic extends AbstractTopic implements Topic, TopicPol
replicators.forEach((cluster, replicator) -> futures.add(replicator.disconnect()));
producers.values().forEach(producer -> futures.add(producer.disconnect()));
if (topicPublishRateLimiter != null) {
- try {
- topicPublishRateLimiter.close();
- } catch (Exception e) {
- log.warn("Error closing topicPublishRateLimiter for topic {}", topic, e);
- }
+ topicPublishRateLimiter.close();
}
subscriptions.forEach((s, sub) -> futures.add(sub.disconnect()));
if (this.resourceGroupPublishLimiter != null) {
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 27e3f1b0345..73ff5e292ae 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
@@ -1281,11 +1281,7 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
replicators.forEach((cluster, replicator) -> futures.add(replicator.disconnect()));
producers.values().forEach(producer -> futures.add(producer.disconnect()));
if (topicPublishRateLimiter != null) {
- try {
- topicPublishRateLimiter.close();
- } catch (Exception e) {
- log.warn("Error closing topicPublishRateLimiter for topic {}", topic, e);
- }
+ topicPublishRateLimiter.close();
}
subscriptions.forEach((s, sub) -> futures.add(sub.disconnect()));
if (this.resourceGroupPublishLimiter != null) {