Jason918 commented on code in PR #15295:
URL: https://github.com/apache/pulsar/pull/15295#discussion_r857359630
##########
pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java:
##########
@@ -1316,6 +1316,56 @@ public void testGetSetSubscriptionDispatchRate() throws
Exception {
admin.topics().delete(topic, true);
}
+ @Test
+ public void testSubscriptionLevelDispatchRate() throws Exception{
+ final String topic = testTopic + UUID.randomUUID();
+ admin.topics().createNonPartitionedTopic(topic);
+
+ String subscriptionName = "testSubscriptionLevelDispatchRate";
+ @Cleanup
+ Consumer<byte[]> consumer =
pulsarClient.newConsumer().subscriptionName(subscriptionName).topic(topic).subscribe();
+ AbstractTopic abstractTopic = (AbstractTopic)
pulsar.getBrokerService().getTopicIfExists(topic).get().get();
+
+ DispatchRate topicLevelRate = DispatchRate.builder()
+ .dispatchThrottlingRateInMsg(100)
+ .dispatchThrottlingRateInByte(1024)
+ .ratePeriodInSecond(1)
+ .build();
+ admin.topicPolicies().setSubscriptionDispatchRate(topic,
topicLevelRate);
+ Awaitility.await().untilAsserted(() ->
+
Assert.assertEquals(admin.topicPolicies().getSubscriptionDispatchRate(topic),
topicLevelRate));
+
+ // topic level is set, applied value should be topic level setting.
+
Assert.assertEquals(admin.topicPolicies().getSubscriptionDispatchRate(topic,
subscriptionName, true),
+ topicLevelRate);
+ // subscription level setting is not set.
+
Assert.assertNull(admin.topicPolicies().getSubscriptionDispatchRate(topic,
subscriptionName));
+
+ DispatchRate subLevelRate = DispatchRate.builder()
+ .dispatchThrottlingRateInMsg(1000)
+ .dispatchThrottlingRateInByte(1024 * 1024)
+ .ratePeriodInSecond(1)
+ .build();
+
+ admin.topicPolicies().setSubscriptionDispatchRate(topic,
subscriptionName, subLevelRate);
+
+
Assert.assertEquals(admin.topicPolicies().getSubscriptionDispatchRate(topic,
subscriptionName), subLevelRate);
+
+ Awaitility.await().untilAsserted(() -> Assert.assertEquals(
+ abstractTopic.getSubscriptionDispatchRate(subscriptionName),
subLevelRate));
+
+ DispatchRateLimiter dispatchRateLimiter =
abstractTopic.getSubscription(subscriptionName)
+ .getDispatcher().getRateLimiter().get();
+ Assert.assertNotNull(dispatchRateLimiter);
+ Assert.assertEquals(dispatchRateLimiter.getDispatchRateOnByte(),
subLevelRate.getDispatchThrottlingRateInByte());
+ Assert.assertEquals(dispatchRateLimiter.getDispatchRateOnMsg(),
subLevelRate.getDispatchThrottlingRateInMsg());
+
+ admin.topicPolicies().removeSubscriptionDispatchRate(topic,
subscriptionName);
+
Assert.assertNull(admin.topicPolicies().getSubscriptionDispatchRate(topic,
subscriptionName));
Review Comment:
fixed
##########
pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java:
##########
@@ -1316,6 +1316,56 @@ public void testGetSetSubscriptionDispatchRate() throws
Exception {
admin.topics().delete(topic, true);
}
+ @Test
+ public void testSubscriptionLevelDispatchRate() throws Exception{
+ final String topic = testTopic + UUID.randomUUID();
+ admin.topics().createNonPartitionedTopic(topic);
+
+ String subscriptionName = "testSubscriptionLevelDispatchRate";
+ @Cleanup
+ Consumer<byte[]> consumer =
pulsarClient.newConsumer().subscriptionName(subscriptionName).topic(topic).subscribe();
+ AbstractTopic abstractTopic = (AbstractTopic)
pulsar.getBrokerService().getTopicIfExists(topic).get().get();
+
+ DispatchRate topicLevelRate = DispatchRate.builder()
+ .dispatchThrottlingRateInMsg(100)
+ .dispatchThrottlingRateInByte(1024)
+ .ratePeriodInSecond(1)
+ .build();
+ admin.topicPolicies().setSubscriptionDispatchRate(topic,
topicLevelRate);
+ Awaitility.await().untilAsserted(() ->
+
Assert.assertEquals(admin.topicPolicies().getSubscriptionDispatchRate(topic),
topicLevelRate));
+
+ // topic level is set, applied value should be topic level setting.
+
Assert.assertEquals(admin.topicPolicies().getSubscriptionDispatchRate(topic,
subscriptionName, true),
+ topicLevelRate);
+ // subscription level setting is not set.
+
Assert.assertNull(admin.topicPolicies().getSubscriptionDispatchRate(topic,
subscriptionName));
+
+ DispatchRate subLevelRate = DispatchRate.builder()
+ .dispatchThrottlingRateInMsg(1000)
+ .dispatchThrottlingRateInByte(1024 * 1024)
+ .ratePeriodInSecond(1)
+ .build();
+
+ admin.topicPolicies().setSubscriptionDispatchRate(topic,
subscriptionName, subLevelRate);
+
+
Assert.assertEquals(admin.topicPolicies().getSubscriptionDispatchRate(topic,
subscriptionName), subLevelRate);
Review Comment:
fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
