This is an automated email from the ASF dual-hosted git repository.
mattisonchao pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new 7856268fb2a [cleanup][broker] Override close method to avoid caching
exception (#15529)
7856268fb2a is described below
commit 7856268fb2aa05c015be5e68e57c46d8966d347f
Author: Jiwei Guo <[email protected]>
AuthorDate: Wed May 11 15:38:15 2022 +0800
[cleanup][broker] Override close method to avoid caching exception (#15529)
(cherry picked from commit 526979a87e3cea5c4c90667ce86aed52927fd631)
---
.../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 ba4756647a5..fbdbd611d50 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
@@ -834,9 +834,7 @@ public abstract class AbstractTopic implements Topic {
}
// attach the resource-group level rate limiters, if set
- String rgName = policies != null && 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 c6ea96179d6..1dbe95fb15a 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
@@ -462,11 +462,7 @@ public class NonPersistentTopic extends AbstractTopic
implements Topic {
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 5505c940af6..6bcfa36320c 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
@@ -1270,11 +1270,7 @@ public class PersistentTopic extends AbstractTopic
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) {
