Skip to content

[Issue 11096][Tests] Attempt to fix flaky test ResourceGroupConfigListenerTest #11601

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

Closed
lhotari wants to merge 1 commit into from
Closed

[Issue 11096][Tests] Attempt to fix flaky test ResourceGroupConfigListenerTest #11601

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
53 changes: 33 additions & 20 deletions ...src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupConfigListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import static org.testng.Assert.assertThrows;
import com.google.common.collect.Sets;
import java.util.Random;
import java.util.UUID;
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.common.policies.data.ClusterData;
Expand All @@ -32,22 +33,39 @@
import org.awaitility.Awaitility;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

public class ResourceGroupConfigListenerTest extends MockedPulsarServiceBaseTest {

ResourceGroup testAddRg = new ResourceGroup();
final String rgName = "testRG";
ResourceGroup testAddRg;
String rgName;
final int MAX_RGS = 10;
final String tenantName = "test-tenant";
final String namespaceName = "test-tenant/test-namespace";
final String clusterName = "test";

@BeforeClass
@Override
protected void setup() throws Exception {
super.internalSetup();
prepareData();
createCluster();
}

private void createCluster() throws PulsarAdminException {
if (!admin.clusters().getClusters().contains(configClusterName)) {
admin.clusters().createCluster(configClusterName, ClusterData.builder().build());
}
}

@BeforeMethod
public void createUniqueResourceGroupName() {
rgName = "testRG" + UUID.randomUUID();
}

@BeforeMethod
public void createResourceGroupObject() {
testAddRg = new ResourceGroup();
testAddRg.setPublishRateInBytes(10000);
testAddRg.setPublishRateInMsgs(100);
testAddRg.setDispatchRateInMsgs(20000);
testAddRg.setDispatchRateInBytes(200);
}

@AfterClass(alwaysRun = true)
Expand Down Expand Up @@ -75,7 +93,7 @@ public void deleteResourceGroup(String rgName) throws PulsarAdminException {
}

public void updateResourceGroup(String rgName, ResourceGroup rg) throws PulsarAdminException {
testAddRg.setPublishRateInMsgs(200000);
rg.setPublishRateInMsgs(200000);
admin.resourcegroups().updateResourceGroup(rgName, rg);
Awaitility.await().untilAsserted(() -> {
final org.apache.pulsar.broker.resourcegroup.ResourceGroup resourceGroup = pulsar
Expand Down Expand Up @@ -115,13 +133,18 @@ public void testResourceGroupCreateDeleteCreate() throws Exception {
@Test
public void testResourceGroupAttachToNamespace() throws Exception {
createResourceGroup(rgName, testAddRg);

final String tenantName = "test-tenant" + UUID.randomUUID();
final String namespaceName = tenantName + "/test-namespace";

admin.tenants().createTenant(tenantName,
new TenantInfoImpl(Sets.newHashSet("fake-admin-role"), Sets.newHashSet(clusterName)));
new TenantInfoImpl(Sets.newHashSet("fake-admin-role"), Sets.newHashSet(configClusterName)));
admin.namespaces().createNamespace(namespaceName);

admin.namespaces().setNamespaceResourceGroup(namespaceName, rgName);
Awaitility.await().untilAsserted(() ->
assertNotNull(pulsar.getResourceGroupServiceManager().getNamespaceResourceGroup(namespaceName)));
assertEquals(pulsar.getResourceGroupServiceManager().getNamespaceResourceGroup(namespaceName)
.resourceGroupName, rgName));

admin.namespaces().removeNamespaceResourceGroup(namespaceName);
Awaitility.await().untilAsserted(() ->
Expand Down Expand Up @@ -165,14 +188,4 @@ public void testResourceGroupCreateMany() throws Exception {
}
});
}

private void prepareData() throws PulsarAdminException {
admin.clusters().createCluster(clusterName, ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build());

testAddRg.setPublishRateInBytes(10000);
testAddRg.setPublishRateInMsgs(100);
testAddRg.setDispatchRateInMsgs(20000);
testAddRg.setDispatchRateInBytes(200);

}
}