Skip to content

[improve][test] Improve SubscriptionMessageDispatchThrottlingTest to reduce the execution time #18039

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
Technoboy- merged 1 commit into from
Oct 17, 2022
Merged

[improve][test] Improve SubscriptionMessageDispatchThrottlingTest to reduce the execution time #18039

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 35 additions & 6 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,29 +53,53 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

@Test(groups = "flaky")
public class MessageDispatchThrottlingTest extends ProducerConsumerBase {
private static final Logger log = LoggerFactory.getLogger(MessageDispatchThrottlingTest.class);

@BeforeMethod
@BeforeClass
@Override
protected void setup() throws Exception {
this.conf.setClusterName("test");
super.internalSetup();
super.producerBaseSetup();
}

@AfterMethod(alwaysRun = true)
@AfterClass(alwaysRun = true)
@Override
protected void cleanup() throws Exception {
super.internalCleanup();
}

@AfterMethod(alwaysRun = true)
protected void reset() throws Exception {
pulsar.getConfiguration().setForceDeleteTenantAllowed(true);
pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true);

for (String tenant : admin.tenants().getTenants()) {
for (String namespace : admin.namespaces().getNamespaces(tenant)) {
admin.namespaces().deleteNamespace(namespace, true);
}
admin.tenants().deleteTenant(tenant, true);
}

for (String cluster : admin.clusters().getClusters()) {
admin.clusters().deleteCluster(cluster);
}

pulsar.getConfiguration().setForceDeleteTenantAllowed(false);
pulsar.getConfiguration().setForceDeleteNamespaceAllowed(false);

super.producerBaseSetup();
}


@DataProvider(name = "subscriptions")
public Object[][] subscriptionsProvider() {
return new Object[][] { new Object[] { SubscriptionType.Shared }, { SubscriptionType.Exclusive } };
Expand Down Expand Up @@ -280,6 +304,7 @@ public void testClusterMsgByteRateLimitingClusterConfig() throws Exception {
final long byteRate = 1024 * 1024;// 1MB rate enough to let all msg to be delivered

int initValue = pulsar.getConfiguration().getDispatchThrottlingRatePerTopicInMsg();
long initBytes = pulsar.getConfiguration().getDispatchThrottlingRatePerTopicInByte();
// (1) Update message-dispatch-rate limit
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRatePerTopicInMsg",
Integer.toString(messageRate));
Expand Down Expand Up @@ -325,7 +350,9 @@ public void testClusterMsgByteRateLimitingClusterConfig() throws Exception {

consumer.close();
producer.close();
pulsar.getConfiguration().setDispatchThrottlingRatePerTopicInMsg(initValue);
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRatePerTopicInMsg",
Integer.toString(initValue));
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRatePerTopicInByte", Long.toString(initBytes));
log.info("-- Exiting {} test --", methodName);
}

Expand Down Expand Up @@ -675,7 +702,8 @@ public void testClusterRateLimitingConfiguration(SubscriptionType subscription)

consumer.close();
producer.close();
pulsar.getConfiguration().setDispatchThrottlingRatePerTopicInMsg(initValue);
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRatePerTopicInMsg",
Integer.toString(initValue));
log.info("-- Exiting {} test --", methodName);
}

Expand Down Expand Up @@ -981,7 +1009,8 @@ public void testClusterPolicyOverrideConfiguration() throws Exception {

producer.close();
producer2.close();

admin.brokers().updateDynamicConfiguration("dispatchThrottlingRatePerTopicInMsg",
Integer.toString(initValue));
log.info("-- Exiting {} test --", methodName);
}

Expand Down
22 changes: 15 additions & 7 deletions ...src/test/java/org/apache/pulsar/client/api/SubscriptionMessageDispatchThrottlingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@
*/
package org.apache.pulsar.client.api;

import static org.awaitility.Awaitility.await;
import com.google.common.collect.Sets;

import java.time.Duration;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.pulsar.broker.BrokerTestUtil;
import org.apache.pulsar.broker.service.Dispatcher;
import org.apache.pulsar.broker.service.persistent.DispatchRateLimiter;
Expand All @@ -38,8 +37,6 @@
import org.testng.Assert;
import org.testng.annotations.Test;

import static org.awaitility.Awaitility.await;

@Test(groups = "flaky")
public class SubscriptionMessageDispatchThrottlingTest extends MessageDispatchThrottlingTest {
private static final Logger log = LoggerFactory.getLogger(SubscriptionMessageDispatchThrottlingTest.class);
Expand Down Expand Up @@ -243,6 +240,7 @@ private void testMessageNotDuplicated(SubscriptionType subscription) throws Exce
admin.namespaces().createNamespace(namespace, Sets.newHashSet("test"));
admin.namespaces().setSubscriptionDispatchRate(namespace, subscriptionDispatchRate);
admin.namespaces().setDispatchRate(namespace, topicDispatchRate);
long initBytes = pulsar.getConfiguration().getDispatchThrottlingRatePerTopicInByte();
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRateInByte", "" + brokerRate);

final int numProducedMessages = 30;
Expand Down Expand Up @@ -302,6 +300,9 @@ private void testMessageNotDuplicated(SubscriptionType subscription) throws Exce

consumer.close();
producer.close();

admin.brokers().updateDynamicConfiguration("dispatchThrottlingRateInByte", Long.toString(initBytes));

admin.topics().delete(topicName, true);
admin.namespaces().deleteNamespace(namespace);
}
Expand Down Expand Up @@ -417,6 +418,7 @@ private void testDispatchRate(SubscriptionType subscription,
admin.namespaces().createNamespace(namespace, Sets.newHashSet("test"));
admin.namespaces().setSubscriptionDispatchRate(namespace, subscriptionDispatchRate);
admin.namespaces().setDispatchRate(namespace, topicDispatchRate);
long initBytes = pulsar.getConfiguration().getDispatchThrottlingRatePerTopicInByte();
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRateInByte", "" + brokerRate);

final int numProducedMessages = 30;
Expand Down Expand Up @@ -480,6 +482,7 @@ private void testDispatchRate(SubscriptionType subscription,

consumer.close();
producer.close();
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRateInByte", Long.toString(initBytes));
admin.topics().delete(topicName, true);
admin.namespaces().deleteNamespace(namespace);
}
Expand Down Expand Up @@ -532,6 +535,7 @@ public void testBrokerBytesRateLimitingReceiveAllMessagesAfterThrottling(Subscri
final String topicName2 = BrokerTestUtil.newUniqueName("persistent://" + namespace2 + "/throttlingAll");
final String subName = "my-subscriber-name-" + subscription;

long initBytes = pulsar.getConfiguration().getDispatchThrottlingRatePerTopicInByte();
final int byteRate = 1000;
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRateInByte", "" + byteRate);
admin.namespaces().createNamespace(namespace1, Sets.newHashSet("test"));
Expand Down Expand Up @@ -591,6 +595,7 @@ public void testBrokerBytesRateLimitingReceiveAllMessagesAfterThrottling(Subscri
consumer2.close();
producer1.close();
producer2.close();
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRateInByte", Long.toString(initBytes));
log.info("-- Exiting {} test --", methodName);
}

Expand Down Expand Up @@ -739,7 +744,9 @@ public void testClusterRateLimitingConfiguration(SubscriptionType subscription)

consumer.close();
producer.close();
pulsar.getConfiguration().setDispatchThrottlingRatePerSubscriptionInMsg(initValue);
admin.brokers().updateDynamicConfiguration("dispatchThrottlingRatePerSubscriptionInMsg",
Integer.toString(initValue));
conf.setDispatchThrottlingOnNonBacklogConsumerEnabled(false);
log.info("-- Exiting {} test --", methodName);
}

Expand Down Expand Up @@ -855,11 +862,12 @@ public void testClusterPolicyOverrideConfiguration() throws Exception {

producer.close();
producer2.close();

admin.brokers().updateDynamicConfiguration("dispatchThrottlingRatePerSubscriptionInMsg",
Integer.toString(initValue));
log.info("-- Exiting {} test --", methodName);
}

@Test(dataProvider = "subscriptions", timeOut = 10000)
@Test(dataProvider = "subscriptions", timeOut = 11000)
public void testClosingRateLimiter(SubscriptionType subscription) throws Exception {
log.info("-- Starting {} test --", methodName);

Expand Down