From ce8e5c0aef3e922bab651892139dffbf06223a40 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 8 Apr 2026 22:54:16 +0300 Subject: [PATCH 1/3] [fix][test] Fix flaky ModularLoadManagerImplTest and IsolatedBookieEnsemblePlacementPolicyTest - ModularLoadManagerImplTest.testRemoveNonExistBundleData: Replace exact bundle count assertion with upper-bound check since not all bundles may have data written in the metadata store at the time of the check. - IsolatedBookieEnsemblePlacementPolicyTest.testSecondaryIsolationGroupsBookies: Use consistent rack assignments across bookie groups to avoid non-deterministic rack resolution when the same bookie appears in multiple groups with different rack values. HashMap iteration order determined which rack assignment won, causing flaky failures in the rack-aware ensemble placement. --- .../IsolatedBookieEnsemblePlacementPolicyTest.java | 10 ++++++---- .../loadbalance/impl/ModularLoadManagerImplTest.java | 8 ++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java index 91c56988c107e..3ca7ef96816a5 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java @@ -508,7 +508,7 @@ public void testOverlappedBookies() throws Exception { assertTrue(ensemble.contains(new BookieSocketAddress(BOOKIE4).toBookieId())); } - @Test + @Test(invocationCount = 10) public void testSecondaryIsolationGroupsBookies() throws Exception { Map> bookieMapping = new HashMap<>(); Map defaultBookieGroup = new HashMap<>(); @@ -522,11 +522,13 @@ public void testSecondaryIsolationGroupsBookies() throws Exception { defaultBookieGroup.put(BOOKIE5, BookieInfo.builder().rack("rack1").build()); Map primaryIsolatedBookieGroup = new HashMap<>(); - primaryIsolatedBookieGroup.put(BOOKIE1, BookieInfo.builder().rack("rack1").build()); + // Use the same rack as in the default group to avoid non-deterministic rack + // resolution when the same bookie appears in multiple groups with different racks. + primaryIsolatedBookieGroup.put(BOOKIE1, BookieInfo.builder().rack("rack0").build()); Map secondaryIsolatedBookieGroup = new HashMap<>(); - secondaryIsolatedBookieGroup.put(BOOKIE2, BookieInfo.builder().rack("rack0").build()); - secondaryIsolatedBookieGroup.put(BOOKIE4, BookieInfo.builder().rack("rack0").build()); + secondaryIsolatedBookieGroup.put(BOOKIE2, BookieInfo.builder().rack("rack1").build()); + secondaryIsolatedBookieGroup.put(BOOKIE4, BookieInfo.builder().rack("rack1").build()); bookieMapping.put("default", defaultBookieGroup); bookieMapping.put(isolatedGroup, primaryIsolatedBookieGroup); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java index b47e5cdff793f..aeea2b67dfd50 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java @@ -1012,7 +1012,7 @@ public void testBundleDataDefaultValue() throws Exception { } - @Test + @Test(invocationCount = 10) public void testRemoveNonExistBundleData() throws PulsarAdminException, InterruptedException, PulsarClientException, PulsarServerException, NoSuchFieldException, IllegalAccessException { @@ -1085,7 +1085,11 @@ public void testRemoveNonExistBundleData() children = bundlesCache.getChildren(bundleDataPath); bundles = children.join(); assertFalse(bundles.isEmpty()); - assertEquals(bundleNumbers, bundles.size()); + // Not all bundles may have bundle data written in the metadata store yet, + // so we only verify that the bundle we care about is present (checked above) + // and that the count does not exceed the expected number of bundles. + assertTrue(bundles.size() <= bundleNumbers, + "Expected at most " + bundleNumbers + " bundles but found " + bundles.size()); NamespaceName namespaceName = NamespaceName.get(tenant, namespace); pulsar1.getAdminClient().namespaces().splitNamespaceBundle(tenant + "/" + namespace, From 521c9b1eeec4fdd24995721468cc2c3cf1f3b154 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 8 Apr 2026 23:02:37 +0300 Subject: [PATCH 2/3] Remove temporary invocationCount from tests --- .../IsolatedBookieEnsemblePlacementPolicyTest.java | 2 +- .../broker/loadbalance/impl/ModularLoadManagerImplTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java index 3ca7ef96816a5..c564ed3ffcf41 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java @@ -508,7 +508,7 @@ public void testOverlappedBookies() throws Exception { assertTrue(ensemble.contains(new BookieSocketAddress(BOOKIE4).toBookieId())); } - @Test(invocationCount = 10) + @Test public void testSecondaryIsolationGroupsBookies() throws Exception { Map> bookieMapping = new HashMap<>(); Map defaultBookieGroup = new HashMap<>(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java index aeea2b67dfd50..ae9d4bca5bb16 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java @@ -1012,7 +1012,7 @@ public void testBundleDataDefaultValue() throws Exception { } - @Test(invocationCount = 10) + @Test public void testRemoveNonExistBundleData() throws PulsarAdminException, InterruptedException, PulsarClientException, PulsarServerException, NoSuchFieldException, IllegalAccessException { From 3a03a4846fa888781dc8df664492deaaf984bf7f Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 8 Apr 2026 23:27:24 +0300 Subject: [PATCH 3/3] Fix testRemoveNonExistBundleData: restore assertEquals and fix root cause The previous fix weakened assertEquals(bundleNumbers, bundles.size()) to assertTrue(bundles.size() <= bundleNumbers), which hides the real problem and changes the test's original intention. Root cause: writeResourceQuotasToZooKeeper() calls updateBundleData() which reads from loadData.getBrokerData(). If the ZK notification from lm2's writeBrokerDataOnZooKeeper hasn't been processed yet by lm1's executor, lm1's loadData only contains bundles from one broker, so fewer than 8 bundles get written to the metadata store. Fix: call lm1.updateAll() before writeResourceQuotasToZooKeeper() to ensure lm1 has fetched both brokers' data from the metadata store. This preserves the original strict assertion that all 8 bundles are present. --- .../loadbalance/impl/ModularLoadManagerImplTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java index ae9d4bca5bb16..1ed4613071759 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java @@ -1063,6 +1063,11 @@ public void testRemoveNonExistBundleData() executorService.submit(latch::countDown); latch.await(); + // Ensure lm1 has loaded broker data from both brokers before writing bundle data. + // Without this, lm1 may only see bundles from one broker, causing fewer than + // bundleNumbers bundles to be written to the metadata store. + lm1.updateAll(); + loadManagerWrapper.writeResourceQuotasToZooKeeper(); MetadataCache bundlesCache = pulsar1.getLocalMetadataStore().getMetadataCache(BundleData.class); @@ -1085,11 +1090,7 @@ public void testRemoveNonExistBundleData() children = bundlesCache.getChildren(bundleDataPath); bundles = children.join(); assertFalse(bundles.isEmpty()); - // Not all bundles may have bundle data written in the metadata store yet, - // so we only verify that the bundle we care about is present (checked above) - // and that the count does not exceed the expected number of bundles. - assertTrue(bundles.size() <= bundleNumbers, - "Expected at most " + bundleNumbers + " bundles but found " + bundles.size()); + assertEquals(bundleNumbers, bundles.size()); NamespaceName namespaceName = NamespaceName.get(tenant, namespace); pulsar1.getAdminClient().namespaces().splitNamespaceBundle(tenant + "/" + namespace,