Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cleanup][broker] Override close method to avoid caching exception. #15529

Merged
merged 1 commit into from May 11, 2022
Merged

[cleanup][broker] Override close method to avoid caching exception. #15529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
View file
Open in desktop
Expand Up @@ -1051,9 +1051,7 @@ public void updateResourceGroupLimiter(Optional<Policies> optPolicies) {
}

// 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);
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PrecisPublishLimiter.java
View file
Open in desktop
Expand Up @@ -133,7 +133,7 @@ public boolean tryAcquire(int numbers, long bytes) {
}

@Override
public void close() throws Exception {
public void close() {
rateLimitFunction.apply();
replaceLimiters(null);
}
Expand Down
5 changes: 5 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiter.java
View file
Open in desktop
Expand Up @@ -71,4 +71,9 @@ public interface PublishRateLimiter extends AutoCloseable {
* @param bytes
*/
boolean tryAcquire(int numbers, long bytes);

/**
* Close the limiter.
*/
void close();
}
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterDisable.java
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ public boolean tryAcquire(int numbers, long bytes) {
}

@Override
public void close() throws Exception {
public void close() {
// No-op
}
}
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PublishRateLimiterImpl.java
View file
Open in desktop
Expand Up @@ -110,7 +110,7 @@ public boolean tryAcquire(int numbers, long bytes) {
}

@Override
public void close() throws Exception {
public void close() {
// no-op
}
}
6 changes: 1 addition & 5 deletions ...oker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
View file
Open in desktop
Expand Up @@ -491,11 +491,7 @@ public CompletableFuture<Void> close(boolean closeWithoutWaitingClientDisconnect
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) {
Expand Down
6 changes: 1 addition & 5 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
View file
Open in desktop
Expand Up @@ -1281,11 +1281,7 @@ public CompletableFuture<Void> close(boolean closeWithoutWaitingClientDisconnect
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) {
Expand Down