This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new de3dbaa15cf [improve][test] Improve V1_AdminApiTest to reduce the
execution time (#18094)
de3dbaa15cf is described below
commit de3dbaa15cf4df64fc2a512c634bedc1f04c23ba
Author: Cong Zhao <[email protected]>
AuthorDate: Thu Oct 20 10:32:48 2022 +0800
[improve][test] Improve V1_AdminApiTest to reduce the execution time
(#18094)
---
.../pulsar/broker/admin/v1/V1_AdminApiTest.java | 117 ++++++++++++++++-----
1 file changed, 88 insertions(+), 29 deletions(-)
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
index c0863cd7333..90005273201 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
@@ -113,8 +113,9 @@ import
org.apache.pulsar.metadata.cache.impl.MetadataCacheImpl;
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;
@@ -136,7 +137,7 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
private NamespaceBundleFactory bundleFactory;
- @BeforeMethod
+ @BeforeClass
@Override
public void setup() throws Exception {
conf.setTopicLevelPoliciesEnabled(false);
@@ -169,7 +170,7 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace("prop-xyz/use/ns1");
}
- @AfterMethod(alwaysRun = true)
+ @AfterClass(alwaysRun = true)
@Override
public void cleanup() throws Exception {
adminTls.close();
@@ -177,6 +178,31 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
mockPulsarSetup.cleanup();
}
+ @AfterMethod(alwaysRun = true)
+ public void reset() throws Exception {
+ pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true);
+ for (String tenant : admin.tenants().getTenants()) {
+ for (String namespace : admin.namespaces().getNamespaces(tenant)) {
+ deleteNamespaceGraceFullyByMultiPulsars(namespace, true,
admin, pulsar,
+ mockPulsarSetup.getPulsar());
+ }
+ }
+ pulsar.getConfiguration().setForceDeleteNamespaceAllowed(false);
+
+ resetConfig();
+
+ if (!admin.clusters().getClusters().contains("use")) {
+ admin.clusters().createCluster("use",
+
ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build());
+ }
+
+ if (!admin.tenants().getTenants().contains("prop-xyz")) {
+ TenantInfoImpl tenantInfo = new TenantInfoImpl(Set.of("role1",
"role2"), Set.of("use"));
+ admin.tenants().createTenant("prop-xyz", tenantInfo);
+ }
+ admin.namespaces().createNamespace("prop-xyz/use/ns1");
+ }
+
@DataProvider(name = "numBundles")
public static Object[][] numBundles() {
return new Object[][] { { 1 }, { 4 } };
@@ -450,6 +476,7 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
@Test
public void testUpdateDynamicConfigurationWithZkWatch() throws Exception {
final int initValue = 30000;
+ long defaultValue =
pulsar.getConfiguration().getBrokerShutdownTimeoutMs();
pulsar.getConfiguration().setBrokerShutdownTimeoutMs(initValue);
// (1) try to update dynamic field
final long shutdownTime = 10;
@@ -485,7 +512,7 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
} catch (Exception e) {
assertTrue(e instanceof PreconditionFailedException);
}
-
+ pulsar.getConfiguration().setBrokerShutdownTimeoutMs(defaultValue);
}
/**
@@ -528,6 +555,9 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
}
// verify value is updated
assertEquals(pulsar.getConfiguration().getBrokerShutdownTimeoutMs(),
newValue);
+
+ cleanup();
+ setup();
}
/**
@@ -546,6 +576,7 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
// (1) try to update dynamic field
final long initValue = 30000;
final long shutdownTime = 10;
+ long defaultValue =
pulsar.getConfiguration().getBrokerShutdownTimeoutMs();
pulsar.getConfiguration().setBrokerShutdownTimeoutMs(initValue);
// update configuration
admin.brokers().updateDynamicConfiguration("brokerShutdownTimeoutMs",
Long.toString(shutdownTime));
@@ -558,6 +589,8 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
// verify value is updated
assertEquals(pulsar.getConfiguration().getBrokerShutdownTimeoutMs(),
shutdownTime);
+
+ pulsar.getConfiguration().setBrokerShutdownTimeoutMs(defaultValue);
}
@Test
@@ -572,6 +605,7 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
// (1) try to update dynamic field
final String configName = "brokerShutdownTimeoutMs";
final long shutdownTime = 10;
+ long defaultValue =
pulsar.getConfiguration().getBrokerShutdownTimeoutMs();
pulsar.getConfiguration().setBrokerShutdownTimeoutMs(30000);
Map<String, String> configs =
admin.brokers().getAllDynamicConfigurations();
assertTrue(configs.isEmpty());
@@ -580,26 +614,29 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
admin.brokers().updateDynamicConfiguration(configName,
Long.toString(shutdownTime));
// Now, znode is created: updateConfigurationAndregisterListeners and
check if configuration updated
assertEquals(Long.parseLong(admin.brokers().getAllDynamicConfigurations().get(configName)),
shutdownTime);
+
+ pulsar.getConfiguration().setBrokerShutdownTimeoutMs(defaultValue);
}
@Test
- public void properties() throws PulsarAdminException {
+ public void testTenant() throws Exception {
Set<String> allowedClusters = Set.of("use");
TenantInfoImpl tenantInfo = new TenantInfoImpl(Set.of("role1",
"role2"), allowedClusters);
- admin.tenants().updateTenant("prop-xyz", tenantInfo);
+ admin.tenants().createTenant("prop-xyz2", tenantInfo);
+ admin.namespaces().createNamespace("prop-xyz2/use/ns1");
- assertEquals(admin.tenants().getTenants(), List.of("prop-xyz"));
+ assertEquals(admin.tenants().getTenants(), List.of("prop-xyz",
"prop-xyz2"));
- assertEquals(admin.tenants().getTenantInfo("prop-xyz"), tenantInfo);
+ assertEquals(admin.tenants().getTenantInfo("prop-xyz2"), tenantInfo);
TenantInfoImpl newPropertyAdmin = new TenantInfoImpl(Set.of("role3",
"role4"), allowedClusters);
- admin.tenants().updateTenant("prop-xyz", newPropertyAdmin);
+ admin.tenants().updateTenant("prop-xyz2", newPropertyAdmin);
- assertEquals(admin.tenants().getTenantInfo("prop-xyz"),
newPropertyAdmin);
+ assertEquals(admin.tenants().getTenantInfo("prop-xyz2"),
newPropertyAdmin);
- admin.namespaces().deleteNamespace("prop-xyz/use/ns1");
- admin.tenants().deleteTenant("prop-xyz");
- assertEquals(admin.tenants().getTenants(), new ArrayList<>());
+ admin.namespaces().deleteNamespace("prop-xyz2/use/ns1");
+ admin.tenants().deleteTenant("prop-xyz2");
+ assertEquals(admin.tenants().getTenants(), List.of("prop-xyz"));
// Check name validation
try {
@@ -709,6 +746,8 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
// both unload and delete should succeed for ns2 on other broker with
a redirect
// otheradmin.namespaces().unload("prop-xyz/use/ns2");
+ tenantInfo = new TenantInfoImpl(Set.of("role1", "role2"),
Set.of("use"));
+ admin.tenants().updateTenant("prop-xyz", tenantInfo);
}
@Test(dataProvider = "topicName")
@@ -1227,15 +1266,25 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
admin.namespaces().createNamespace("prop-xyz/use/ns1-bundles",
numBundles);
// create consumer and subscription
-
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds2").subscriptionName("my-sub")
- .subscribe();
-
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds2").subscriptionName("my-sub-1")
- .subscribe();
-
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds2").subscriptionName("my-sub-2")
+ @Cleanup
+ Consumer<byte[]> subscribe =
+
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds2").subscriptionName("my-sub")
+ .subscribe();
+ @Cleanup
+ Consumer<byte[]> subscribe1 =
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds2")
+ .subscriptionName("my-sub-1")
.subscribe();
-
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds1").subscriptionName("my-sub")
+ @Cleanup
+ Consumer<byte[]> subscribe2 =
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds2")
+ .subscriptionName("my-sub-2")
.subscribe();
-
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds1").subscriptionName("my-sub-1")
+ @Cleanup
+ Consumer<byte[]> subscribe3 =
+
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds1").subscriptionName("my-sub")
+ .subscribe();
+ @Cleanup
+ Consumer<byte[]> subscribe4 =
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds1")
+ .subscriptionName("my-sub-1")
.subscribe();
// Create producer
@@ -1299,7 +1348,7 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
Consumer<byte[]> consumer2 =
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds2")
.subscriptionName("my-sub-1").subscribe();
/* Consumer consumer3 = */
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds2")
- .subscriptionName("my-sub-2").subscribe();
+ .subscriptionName("my-sub-2").subscribe().close();
Consumer<byte[]> consumer4 =
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds1")
.subscriptionName("my-sub").subscribe();
Consumer<byte[]> consumer5 =
pulsarClient.newConsumer().topic("persistent://prop-xyz/use/ns1-bundles/ds1")
@@ -1456,24 +1505,29 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
@Test
public void testBackwardCompatiblity() throws Exception {
- assertEquals(admin.tenants().getTenants(), List.of("prop-xyz"));
- assertEquals(admin.tenants().getTenantInfo("prop-xyz").getAdminRoles(),
+ Set<String> allowedClusters = Set.of("use");
+ TenantInfoImpl tenantInfo = new TenantInfoImpl(Set.of("role1",
"role2"), allowedClusters);
+ admin.tenants().createTenant("prop-xyz2", tenantInfo);
+ admin.namespaces().createNamespace("prop-xyz2/use/ns1");
+
+ assertEquals(admin.tenants().getTenants(), List.of("prop-xyz",
"prop-xyz2"));
+
assertEquals(admin.tenants().getTenantInfo("prop-xyz2").getAdminRoles(),
List.of("role1", "role2"));
-
assertEquals(admin.tenants().getTenantInfo("prop-xyz").getAllowedClusters(),
Set.of("use"));
+
assertEquals(admin.tenants().getTenantInfo("prop-xyz2").getAllowedClusters(),
Set.of("use"));
// Try to deserialize property JSON with IncompatiblePropertyAdmin
format
// it should succeed ignoring missing fields
TenantsImpl properties = (TenantsImpl) admin.tenants();
- IncompatiblePropertyAdmin result =
properties.request(properties.getWebTarget().path("prop-xyz"))
+ IncompatiblePropertyAdmin result =
properties.request(properties.getWebTarget().path("prop-xyz2"))
.get(IncompatiblePropertyAdmin.class);
assertEquals(result.allowedClusters, Set.of("use"));
assertEquals(result.someNewIntField, 0);
assertNull(result.someNewString);
- admin.namespaces().deleteNamespace("prop-xyz/use/ns1");
- admin.tenants().deleteTenant("prop-xyz");
- assertEquals(admin.tenants().getTenants(), new ArrayList<>());
+ admin.namespaces().deleteNamespace("prop-xyz2/use/ns1");
+ admin.tenants().deleteTenant("prop-xyz2");
+ assertEquals(admin.tenants().getTenants(), Set.of("prop-xyz"));
}
@Test(dataProvider = "topicName")
@@ -1742,6 +1796,8 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
*/
@Test
public void testPersistentTopicsExpireMessages() throws Exception {
+ cleanup();
+ setup();
// Force to create a topic
publishMessagesOnPersistentTopic("persistent://prop-xyz/use/ns1/ds2",
0);
@@ -1868,7 +1924,7 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
final int numOfPartitions = 4;
admin.topics().createPartitionedTopic(topic1, numOfPartitions);
// Create a consumer to get stats on this topic
-
pulsarClient.newConsumer().topic(topic1).subscriptionName("my-subscriber-name").subscribe();
+
pulsarClient.newConsumer().topic(topic1).subscriptionName("my-subscriber-name").subscribe().close();
TopicsImpl persistent = (TopicsImpl) admin.topics();
Field field = TopicsImpl.class.getDeclaredField("adminTopics");
@@ -1998,6 +2054,9 @@ public class V1_AdminApiTest extends
MockedPulsarServiceBaseTest {
final String topicName =
"persistent://prop-xyz/use/getBundleNs/topic1";
String bundleRange = admin.lookups().getBundleRange(topicName);
assertEquals(bundleRange,
pulsar.getNamespaceService().getBundle(TopicName.get(topicName)).getBundleRange());
+
+ admin.tenants().updateTenant("prop-xyz", new
TenantInfoImpl(Set.of("role1", "role2"),
+ Set.of("use")));
}
@Test
