From 1f2896670de1b6ec692365acdabb547f0e36f787 Mon Sep 17 00:00:00 2001 From: Heesung Sohn Date: Wed, 17 Apr 2024 09:12:20 -0700 Subject: [PATCH] 4/17 --- .../pulsar/broker/admin/AdminApi2Test.java | 16 +++++++++++++++- .../broker/stats/ManagedLedgerMetricsTest.java | 5 ++++- .../broker/stats/TransactionMetricsTest.java | 6 ++++-- .../client/impl/BrokerClientIntegrationTest.java | 4 ++++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java index 6bc64f4dd65d05..13fd6be1885365 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java @@ -67,6 +67,7 @@ import org.apache.pulsar.broker.ServiceConfiguration; import org.apache.pulsar.broker.admin.AdminApiTest.MockedPulsarService; import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; +import org.apache.pulsar.broker.loadbalance.extensions.ExtensibleLoadManagerImpl; import org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl; import org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerWrapper; import org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl; @@ -155,8 +156,8 @@ public void setup() throws Exception { // namespace ownership mockPulsarSetup = new MockedPulsarService(this.conf); mockPulsarSetup.setup(); - setupClusters(); + setupSystemNamespace(); } @Test @@ -234,6 +235,9 @@ private void cleanupCluster() throws Exception { pulsar.getConfiguration().setForceDeleteTenantAllowed(true); pulsar.getConfiguration().setForceDeleteNamespaceAllowed(true); for (String tenant : admin.tenants().getTenants()) { + if (tenant.equals("pulsar")) { + continue; + } for (String namespace : admin.namespaces().getNamespaces(tenant)) { deleteNamespaceWithRetry(namespace, true, admin, pulsar, mockPulsarSetup.getPulsar()); @@ -492,6 +496,9 @@ private void setTopicPoliciesAndValidate(PulsarAdmin admin2 */ @Test public void nonPersistentTopics() throws Exception { + if (ExtensibleLoadManagerImpl.isLoadManagerExtensionEnabled(pulsar)) { + return; + } final String topicName = "nonPersistentTopic"; final String nonPersistentTopicName = "non-persistent://" + defaultNamespace + "/" + topicName; @@ -1352,6 +1359,10 @@ public void brokerNamespaceIsolationPolicies() throws Exception { // 2. update isolation policy, without broker matched, lookup will fail. @Test public void brokerNamespaceIsolationPoliciesUpdateOnTime() throws Exception { + if (ExtensibleLoadManagerImpl.isLoadManagerExtensionEnabled(pulsar)) { + return; + } + String brokerName = pulsar.getAdvertisedAddress(); String ns1Name = defaultTenant + "/test_ns1_iso_" + System.currentTimeMillis(); admin.namespaces().createNamespace(ns1Name, Set.of("test")); @@ -1702,6 +1713,9 @@ private void setNamespaceAttr(NamespaceAttr namespaceAttr){ @Test(dataProvider = "namespaceAttrs") public void testDeleteNamespace(NamespaceAttr namespaceAttr) throws Exception { + if (ExtensibleLoadManagerImpl.isLoadManagerExtensionEnabled(pulsar)) { + return; + } restartClusterAfterTest(); // Set conf. diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedLedgerMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedLedgerMetricsTest.java index 9cba233e03d806..0ca380ad055a73 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedLedgerMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/ManagedLedgerMetricsTest.java @@ -29,6 +29,7 @@ import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; import org.apache.bookkeeper.mledger.impl.ManagedLedgerMBeanImpl; import org.apache.pulsar.broker.ServiceConfiguration; +import org.apache.pulsar.broker.loadbalance.extensions.ExtensibleLoadManagerImpl; import org.apache.pulsar.broker.service.BrokerTestBase; import org.apache.pulsar.broker.stats.metrics.ManagedLedgerMetrics; import org.apache.pulsar.client.api.Producer; @@ -71,7 +72,9 @@ public void testManagedLedgerMetrics() throws Exception { final String addEntryRateKey = "brk_ml_AddEntryMessagesRate"; List list1 = metrics.generate(); - Assert.assertTrue(list1.isEmpty()); + if (!ExtensibleLoadManagerImpl.isLoadManagerExtensionEnabled(pulsar)) { + Assert.assertTrue(list1.isEmpty()); + } Producer producer = pulsarClient.newProducer().topic("persistent://my-property/use/my-ns/my-topic1") .create(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionMetricsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionMetricsTest.java index fa40319d15238e..e3e0d67d8ef58f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionMetricsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/TransactionMetricsTest.java @@ -38,7 +38,7 @@ import java.util.regex.Pattern; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.broker.ServiceConfiguration; -import org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl; +import org.apache.pulsar.broker.loadbalance.extensions.ExtensibleLoadManagerImpl; import org.apache.pulsar.broker.service.BrokerTestBase; import org.apache.pulsar.broker.stats.prometheus.PrometheusMetricsGenerator; import org.apache.pulsar.client.api.Consumer; @@ -69,7 +69,6 @@ public class TransactionMetricsTest extends BrokerTestBase { protected void setup() throws Exception { ServiceConfiguration serviceConfiguration = getDefaultConf(); serviceConfiguration.setTransactionCoordinatorEnabled(true); - serviceConfiguration.setLoadManagerClassName(ModularLoadManagerImpl.class.getName()); super.baseSetup(serviceConfiguration); } @@ -287,6 +286,9 @@ public void testManagedLedgerMetrics() throws Exception { PrometheusMetricsGenerator.generate(pulsar, false, false, false, statsOut); metricsStr = statsOut.toString(); metrics = parseMetrics(metricsStr); + if (ExtensibleLoadManagerImpl.isLoadManagerExtensionEnabled(pulsar)) { + return; + } metric = metrics.get("pulsar_storage_size"); assertEquals(metric.size(), 2); metric = metrics.get("pulsar_storage_logical_size"); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java index c2715de986ad8a..18fdb17fc13a89 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java @@ -68,6 +68,7 @@ import org.apache.bookkeeper.client.PulsarMockLedgerHandle; import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl; import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; +import org.apache.pulsar.broker.loadbalance.extensions.ExtensibleLoadManagerImpl; import org.apache.pulsar.broker.namespace.OwnershipCache; import org.apache.pulsar.broker.resources.BaseResources; import org.apache.pulsar.broker.service.AbstractDispatcherSingleActiveConsumer; @@ -157,6 +158,9 @@ public Object[][] booleanFlagProvider() { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testDisconnectClientWithoutClosingConnection() throws Exception { + if (ExtensibleLoadManagerImpl.isLoadManagerExtensionEnabled(pulsar)) { + return; + } final String ns1 = "my-property/con-ns1"; final String ns2 = "my-property/con-ns2";