codelipenghui commented on a change in pull request #11135:
URL: https://github.com/apache/pulsar/pull/11135#discussion_r660230421
##########
File path:
pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
##########
@@ -417,56 +418,45 @@ public void
testBytesRateLimitingReceiveAllMessagesAfterThrottling(SubscriptionT
final String namespace = "my-property/throttling_ns";
final String topicName = "persistent://" + namespace +
"/throttlingAll";
+ final String subscriptionName = "my-subscriber-name";
- final int byteRate = 100;
+ //
+ final int byteRate = 250;
DispatchRate dispatchRate = DispatchRate.builder()
.dispatchThrottlingRateInMsg(-1)
.dispatchThrottlingRateInByte(byteRate)
.ratePeriodInSecond(1)
.build();
admin.namespaces().createNamespace(namespace, Sets.newHashSet("test"));
admin.namespaces().setDispatchRate(namespace, dispatchRate);
+ admin.topics().createSubscription(topicName, subscriptionName,
MessageId.earliest);
// create producer and topic
- Producer<byte[]> producer =
pulsarClient.newProducer().topic(topicName).create();
+ Producer<byte[]> producer =
pulsarClient.newProducer().topic(topicName).enableBatching(false).create();
PersistentTopic topic = (PersistentTopic)
pulsar.getBrokerService().getOrCreateTopic(topicName).get();
- boolean isMessageRateUpdate = false;
- int retry = 5;
- for (int i = 0; i < retry; i++) {
- if (topic.getDispatchRateLimiter().get().getDispatchRateOnByte() >
0) {
- isMessageRateUpdate = true;
- break;
- } else {
- if (i != retry - 1) {
- Thread.sleep(100);
- }
- }
- }
- Assert.assertTrue(isMessageRateUpdate);
+ Awaitility.await().until(() ->
topic.getDispatchRateLimiter().get().getDispatchRateOnByte() > 0);
Assert.assertEquals(admin.namespaces().getDispatchRate(namespace),
dispatchRate);
final int numProducedMessages = 20;
- final CountDownLatch latch = new CountDownLatch(numProducedMessages);
final AtomicInteger totalReceived = new AtomicInteger(0);
- Consumer<byte[]> consumer =
pulsarClient.newConsumer().topic(topicName).subscriptionName("my-subscriber-name")
+ Consumer<byte[]> consumer =
pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName)
.subscriptionType(subscription).messageListener((c1, msg) -> {
Assert.assertNotNull(msg, "Message cannot be null");
String receivedMessage = new String(msg.getData());
log.debug("Received message [{}] in the listener",
receivedMessage);
totalReceived.incrementAndGet();
- latch.countDown();
}).subscribe();
+
// deactive cursors
deactiveCursors((ManagedLedgerImpl) topic.getManagedLedger());
- // Asynchronously produce messages
for (int i = 0; i < numProducedMessages; i++) {
- producer.send(new byte[byteRate / 10]);
+ producer.send(new byte[99]);
}
- latch.await();
- Assert.assertEquals(totalReceived.get(), numProducedMessages);
+ Awaitility.await().atLeast(3, TimeUnit.SECONDS)
Review comment:
Why we need `atLeast` here?
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
##########
@@ -276,8 +278,10 @@ public synchronized void readMoreEntries() {
}
}
- protected int calculateNumOfMessageToRead(int
currentTotalAvailablePermits) {
+ // left pair is messagesToRead, right pair is bytesToRead
+ protected MutablePair<Integer, Integer> calculateToRead(int
currentTotalAvailablePermits) {
Review comment:
Why need MutablePair here? we'd better do not allow to modify it outside?
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java
##########
@@ -349,7 +352,7 @@ protected void readMoreEntries(Consumer consumer) {
}
}
- protected int calculateNumOfMessageToRead(Consumer consumer) {
+ protected MutablePair<Integer, Integer> calculateToRead(Consumer consumer)
{
Review comment:
Is it possible to move to `AbstractBaseDispatcher`? Looks many
duplicated code with the PersistentDispatcherMultipleConsumers.
##########
File path:
pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
##########
@@ -417,56 +418,45 @@ public void
testBytesRateLimitingReceiveAllMessagesAfterThrottling(SubscriptionT
final String namespace = "my-property/throttling_ns";
final String topicName = "persistent://" + namespace +
"/throttlingAll";
+ final String subscriptionName = "my-subscriber-name";
- final int byteRate = 100;
+ //
+ final int byteRate = 250;
DispatchRate dispatchRate = DispatchRate.builder()
.dispatchThrottlingRateInMsg(-1)
.dispatchThrottlingRateInByte(byteRate)
.ratePeriodInSecond(1)
.build();
admin.namespaces().createNamespace(namespace, Sets.newHashSet("test"));
admin.namespaces().setDispatchRate(namespace, dispatchRate);
+ admin.topics().createSubscription(topicName, subscriptionName,
MessageId.earliest);
// create producer and topic
- Producer<byte[]> producer =
pulsarClient.newProducer().topic(topicName).create();
+ Producer<byte[]> producer =
pulsarClient.newProducer().topic(topicName).enableBatching(false).create();
PersistentTopic topic = (PersistentTopic)
pulsar.getBrokerService().getOrCreateTopic(topicName).get();
- boolean isMessageRateUpdate = false;
- int retry = 5;
- for (int i = 0; i < retry; i++) {
- if (topic.getDispatchRateLimiter().get().getDispatchRateOnByte() >
0) {
- isMessageRateUpdate = true;
- break;
- } else {
- if (i != retry - 1) {
- Thread.sleep(100);
- }
- }
- }
- Assert.assertTrue(isMessageRateUpdate);
+ Awaitility.await().until(() ->
topic.getDispatchRateLimiter().get().getDispatchRateOnByte() > 0);
Assert.assertEquals(admin.namespaces().getDispatchRate(namespace),
dispatchRate);
final int numProducedMessages = 20;
- final CountDownLatch latch = new CountDownLatch(numProducedMessages);
final AtomicInteger totalReceived = new AtomicInteger(0);
- Consumer<byte[]> consumer =
pulsarClient.newConsumer().topic(topicName).subscriptionName("my-subscriber-name")
+ Consumer<byte[]> consumer =
pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName)
.subscriptionType(subscription).messageListener((c1, msg) -> {
Assert.assertNotNull(msg, "Message cannot be null");
String receivedMessage = new String(msg.getData());
log.debug("Received message [{}] in the listener",
receivedMessage);
totalReceived.incrementAndGet();
- latch.countDown();
}).subscribe();
+
// deactive cursors
deactiveCursors((ManagedLedgerImpl) topic.getManagedLedger());
- // Asynchronously produce messages
for (int i = 0; i < numProducedMessages; i++) {
- producer.send(new byte[byteRate / 10]);
+ producer.send(new byte[99]);
Review comment:
It's better to use asynchronous API? If we use synchronous API, this
means for each message we need to ensure the publish latency is lower than
50ms, otherwise it should be a flaky test.
##########
File path:
pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
##########
@@ -417,56 +418,45 @@ public void
testBytesRateLimitingReceiveAllMessagesAfterThrottling(SubscriptionT
final String namespace = "my-property/throttling_ns";
final String topicName = "persistent://" + namespace +
"/throttlingAll";
+ final String subscriptionName = "my-subscriber-name";
- final int byteRate = 100;
+ //
+ final int byteRate = 250;
DispatchRate dispatchRate = DispatchRate.builder()
.dispatchThrottlingRateInMsg(-1)
.dispatchThrottlingRateInByte(byteRate)
.ratePeriodInSecond(1)
.build();
admin.namespaces().createNamespace(namespace, Sets.newHashSet("test"));
admin.namespaces().setDispatchRate(namespace, dispatchRate);
+ admin.topics().createSubscription(topicName, subscriptionName,
MessageId.earliest);
// create producer and topic
- Producer<byte[]> producer =
pulsarClient.newProducer().topic(topicName).create();
+ Producer<byte[]> producer =
pulsarClient.newProducer().topic(topicName).enableBatching(false).create();
PersistentTopic topic = (PersistentTopic)
pulsar.getBrokerService().getOrCreateTopic(topicName).get();
- boolean isMessageRateUpdate = false;
- int retry = 5;
- for (int i = 0; i < retry; i++) {
- if (topic.getDispatchRateLimiter().get().getDispatchRateOnByte() >
0) {
- isMessageRateUpdate = true;
- break;
- } else {
- if (i != retry - 1) {
- Thread.sleep(100);
- }
- }
- }
- Assert.assertTrue(isMessageRateUpdate);
+ Awaitility.await().until(() ->
topic.getDispatchRateLimiter().get().getDispatchRateOnByte() > 0);
Assert.assertEquals(admin.namespaces().getDispatchRate(namespace),
dispatchRate);
final int numProducedMessages = 20;
- final CountDownLatch latch = new CountDownLatch(numProducedMessages);
final AtomicInteger totalReceived = new AtomicInteger(0);
- Consumer<byte[]> consumer =
pulsarClient.newConsumer().topic(topicName).subscriptionName("my-subscriber-name")
+ Consumer<byte[]> consumer =
pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName)
.subscriptionType(subscription).messageListener((c1, msg) -> {
Assert.assertNotNull(msg, "Message cannot be null");
String receivedMessage = new String(msg.getData());
log.debug("Received message [{}] in the listener",
receivedMessage);
totalReceived.incrementAndGet();
- latch.countDown();
}).subscribe();
+
// deactive cursors
deactiveCursors((ManagedLedgerImpl) topic.getManagedLedger());
- // Asynchronously produce messages
for (int i = 0; i < numProducedMessages; i++) {
- producer.send(new byte[byteRate / 10]);
+ producer.send(new byte[99]);
Review comment:
And what's the reason change to `new byte[99]`
--
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]
