You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/21 02:18:38 UTC
[pulsar] 06/16: Fix flaky test BrokerServiceLookupTest.testModularLoadManagerSplitBundle (#13159)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 6dea985c58b11d806e2a1f8659ae84bce5550932
Author: Zhanpeng Wu <zh...@qq.com>
AuthorDate: Tue Dec 7 21:31:10 2021 +0800
Fix flaky test BrokerServiceLookupTest.testModularLoadManagerSplitBundle (#13159)
Co-authored-by: wuzhanpeng <wu...@bigo.sg>
(cherry picked from commit 4b319f38256d586bf179ac8df9f401709b128b15)
---
.../apache/pulsar/client/api/BrokerServiceLookupTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java
index 251ccd3..6628cf6 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java
@@ -654,15 +654,18 @@ public class BrokerServiceLookupTest extends ProducerConsumerBase {
conf2.setLoadManagerClassName(ModularLoadManagerImpl.class.getName());
conf2.setZookeeperServers("localhost:2181");
conf2.setConfigurationStoreServers("localhost:3181");
-
- @Cleanup
- PulsarService pulsar2 = startBroker(conf2);
+ conf2.setLoadBalancerAutoBundleSplitEnabled(true);
+ conf2.setLoadBalancerAutoUnloadSplitBundlesEnabled(true);
+ conf2.setLoadBalancerNamespaceBundleMaxTopics(1);
// configure broker-1 with ModularLoadManager
stopBroker();
conf.setLoadManagerClassName(ModularLoadManagerImpl.class.getName());
startBroker();
+ @Cleanup
+ PulsarService pulsar2 = startBroker(conf2);
+
pulsar.getLoadManager().get().writeLoadReportOnZookeeper();
pulsar2.getLoadManager().get().writeLoadReportOnZookeeper();
@@ -732,9 +735,6 @@ public class BrokerServiceLookupTest extends ProducerConsumerBase {
.getLoadManager().get()).getLoadManager();
updateAllMethod.invoke(loadManager);
- conf2.setLoadBalancerAutoBundleSplitEnabled(true);
- conf2.setLoadBalancerAutoUnloadSplitBundlesEnabled(true);
- conf2.setLoadBalancerNamespaceBundleMaxTopics(1);
loadManager.checkNamespaceBundleSplit();
// (6) Broker-2 should get the watch and update bundle cache