Skip to content

[feat][broker]: support dynamic update topic broker-level publish-rate #14387

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

Merged
codelipenghui merged 3 commits into from
Mar 18, 2022
Merged

[feat][broker]: support dynamic update topic broker-level publish-rate #14387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
363cb46
Dynamic update topic broker-level publish-rate
AnonHxy Feb 20, 2022
1d49557
Add ut for multi-level publish rate
AnonHxy Mar 4, 2022
3465353
Fix broker level publishRate Ut
AnonHxy Mar 17, 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
5 changes: 5 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,4 +1118,9 @@ public void updateBrokerSubscriptionDispatchRate() {
topicPolicies.getSubscriptionDispatchRate().updateBrokerValue(
subscriptionDispatchRateInBroker(brokerService.pulsar().getConfiguration()));
}

public void updateBrokerPublishRate() {
topicPolicies.getPublishRate().updateBrokerValue(
publishRateInBroker(brokerService.pulsar().getConfiguration()));
}
}
19 changes: 19 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2169,6 +2169,15 @@ private void updateConfigurationAndRegisterListeners() {
(publisherThrottlingTickTimeMillis) -> {
setupBrokerPublishRateLimiterMonitor();
});

// add listener to update topic publish-rate dynamic config
registerConfigurationListener("maxPublishRatePerTopicInMessages",
maxPublishRatePerTopicInMessages -> updateMaxPublishRatePerTopicInMessages()
);
registerConfigurationListener("maxPublishRatePerTopicInBytes",
maxPublishRatePerTopicInMessages -> updateMaxPublishRatePerTopicInMessages()
);

// add listener to notify broker publish-rate dynamic config
registerConfigurationListener("brokerPublisherThrottlingMaxMessageRate",
(brokerPublisherThrottlingMaxMessageRate) ->
Expand Down Expand Up @@ -2205,6 +2214,16 @@ private void updateBrokerDispatchThrottlingMaxRate() {
}
}

private void updateMaxPublishRatePerTopicInMessages() {
this.pulsar().getExecutor().submit(() ->
forEachTopic(topic -> {
if (topic instanceof AbstractTopic) {
((AbstractTopic) topic).updateBrokerPublishRate();
((AbstractTopic) topic).updatePublishDispatcher();
}
}));
}

private void updateBrokerPublisherThrottlingMaxRate() {
int currentMaxMessageRate = pulsar.getConfiguration().getBrokerPublisherThrottlingMaxMessageRate();
long currentMaxByteRate = pulsar.getConfiguration().getBrokerPublisherThrottlingMaxByteRate();
Expand Down
42 changes: 42 additions & 0 deletions ...er/src/test/java/org/apache/pulsar/broker/service/PrecisTopicPublishRateThrottleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.common.policies.data.PublishRate;
import org.awaitility.Awaitility;
import org.testng.Assert;
import org.testng.annotations.Test;

Expand Down Expand Up @@ -140,4 +141,45 @@ public void testPrecisTopicPublishRateLimitingProduceRefresh() throws Exception
Assert.assertNotNull(messageId);
super.internalCleanup();
}

@Test
public void testBrokerLevelPublishRateDynamicUpdate() throws Exception{
conf.setPreciseTopicPublishRateLimiterEnable(true);
conf.setTopicLevelPoliciesEnabled(true);
conf.setSystemTopicEnabled(true);
conf.setMaxPendingPublishRequestsPerConnection(0);
super.baseSetup();
final String topic = "persistent://prop/ns-abc/testMultiLevelPublishRate";
org.apache.pulsar.client.api.Producer<byte[]> producer = pulsarClient.newProducer()
.topic(topic)
.producerName("producer-name")
.create();

final int rateInMsg = 10;
final long rateInByte = 20;

// maxPublishRatePerTopicInMessages
admin.brokers().updateDynamicConfiguration("maxPublishRatePerTopicInMessages", "" + rateInMsg);
Awaitility.await()
.untilAsserted(() ->
Assert.assertEquals(admin.brokers().getAllDynamicConfigurations().get("maxPublishRatePerTopicInMessages"),
"" + rateInMsg));
Topic topicRef = pulsar.getBrokerService().getTopicReference(topic).get();
Assert.assertNotNull(topicRef);
PrecisPublishLimiter limiter = ((PrecisPublishLimiter) ((AbstractTopic) topicRef).topicPublishRateLimiter);
Awaitility.await().untilAsserted(() -> Assert.assertEquals(limiter.publishMaxMessageRate, rateInMsg));
Assert.assertEquals(limiter.publishMaxByteRate, 0);

// maxPublishRatePerTopicInBytes
admin.brokers().updateDynamicConfiguration("maxPublishRatePerTopicInBytes", "" + rateInByte);
Awaitility.await()
.untilAsserted(() ->
Assert.assertEquals(admin.brokers().getAllDynamicConfigurations().get("maxPublishRatePerTopicInBytes"),
"" + rateInByte));
Awaitility.await().untilAsserted(() -> Assert.assertEquals(limiter.publishMaxByteRate, rateInByte));
Assert.assertEquals(limiter.publishMaxMessageRate, rateInMsg);

producer.close();
super.internalCleanup();
}
}