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

[improve][broker]tidy update subscriptions dispatcher rate-limiter #15789

Merged
merged 3 commits into from
Jun 3, 2022
Merged

[improve][broker]tidy update subscriptions dispatcher rate-limiter #15789

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d57139
tidy update subscriptions dispatcher rate-limiter
AnonHxy May 25, 2022
622f9d9
Fix for comment
AnonHxy May 28, 2022
f1b14a9
Fix init
AnonHxy May 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 17 additions & 32 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,14 +384,6 @@ private void initializeDispatchRateLimiterIfNeeded() {
this.dispatchRateLimiter = Optional.of(new DispatchRateLimiter(this, Type.TOPIC));
}

// dispatch rate limiter for each subscription
subscriptions.forEach((name, subscription) -> {
Dispatcher dispatcher = subscription.getDispatcher();
if (dispatcher != null) {
dispatcher.initializeDispatchRateLimiterIfNeeded();
}
});

// dispatch rate limiter for each replicator
replicators.forEach((name, replicator) ->
replicator.initializeDispatchRateLimiterIfNeeded());
Expand Down Expand Up @@ -2409,19 +2401,7 @@ public CompletableFuture<Void> onPoliciesUpdate(Policies data) {
producer.checkPermissionsAsync().thenRun(producer::checkEncryption)));

return FutureUtil.waitForAll(producerCheckFutures).thenCompose((__) -> {
List<CompletableFuture<Void>> subscriptionCheckFutures = new ArrayList<>((int) subscriptions.size());
subscriptions.forEach((subName, sub) -> {
List<CompletableFuture<Void>> consumerCheckFutures = new ArrayList<>(sub.getConsumers().size());
sub.getConsumers().forEach(consumer -> consumerCheckFutures.add(consumer.checkPermissionsAsync()));
subscriptionCheckFutures.add(FutureUtil.waitForAll(consumerCheckFutures).thenRun(() -> {
Dispatcher dispatcher = sub.getDispatcher();
if (dispatcher != null) {
dispatcher.getRateLimiter().ifPresent(DispatchRateLimiter::updateDispatchRate);
}
}));
});

return FutureUtil.waitForAll(subscriptionCheckFutures).thenCompose((___) -> {
return updateSubscriptionsDispatcherRateLimiter().thenCompose((___) -> {
replicators.forEach((name, replicator) ->
replicator.getRateLimiter().ifPresent(DispatchRateLimiter::updateDispatchRate)
);
Expand Down Expand Up @@ -3050,17 +3030,7 @@ public void onUpdate(TopicPolicies policies) {

dispatchRateLimiter.ifPresent(DispatchRateLimiter::updateDispatchRate);

List<CompletableFuture<Void>> consumerCheckFutures = new ArrayList<>();
subscriptions.forEach((subName, sub) -> sub.getConsumers().forEach(consumer -> {
consumerCheckFutures.add(consumer.checkPermissionsAsync().thenRun(() -> {
Dispatcher dispatcher = sub.getDispatcher();
if (dispatcher != null) {
dispatcher.updateRateLimiter();
}
}));
}));

FutureUtil.waitForAll(consumerCheckFutures).thenRun(() -> {
updateSubscriptionsDispatcherRateLimiter().thenRun(() -> {
updatePublishDispatcher();
updateSubscribeRateLimiter();
replicators.forEach((name, replicator) -> replicator.getRateLimiter()
Expand All @@ -3083,6 +3053,21 @@ public void onUpdate(TopicPolicies policies) {
});
}

private CompletableFuture<Void> updateSubscriptionsDispatcherRateLimiter() {
List<CompletableFuture<Void>> subscriptionCheckFutures = new ArrayList<>((int) subscriptions.size());
subscriptions.forEach((subName, sub) -> {
List<CompletableFuture<Void>> consumerCheckFutures = new ArrayList<>(sub.getConsumers().size());
sub.getConsumers().forEach(consumer -> consumerCheckFutures.add(consumer.checkPermissionsAsync()));
subscriptionCheckFutures.add(FutureUtil.waitForAll(consumerCheckFutures).thenRun(() -> {
Dispatcher dispatcher = sub.getDispatcher();
if (dispatcher != null) {
dispatcher.updateRateLimiter();
}
}));
});
return FutureUtil.waitForAll(subscriptionCheckFutures);
}

private void initializeTopicDispatchRateLimiterIfNeeded(TopicPolicies policies) {
synchronized (dispatchRateLimiterLock) {
if (!dispatchRateLimiter.isPresent() && policies.getDispatchRate() != null) {
Expand Down