Skip to content

[fix][test] Fix flaky ModularLoadManagerImplTest and IsolatedBookieEnsemblePlacementPolicyTest #25496

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

Merged
merlimat merged 3 commits into from
Apr 8, 2026
Merged

[fix][test] Fix flaky ModularLoadManagerImplTest and IsolatedBookieEnsemblePlacementPolicyTest #25496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce8e5c0
[fix][test] Fix flaky ModularLoadManagerImplTest and IsolatedBookieEn…
lhotari Apr 8, 2026
521c9b1
Remove temporary invocationCount from tests
lhotari Apr 8, 2026
3a03a48
Fix testRemoveNonExistBundleData: restore assertEquals and fix root c…
lhotari Apr 8, 2026
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
8 changes: 5 additions & 3 deletions ...ava/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,11 +522,13 @@ public void testSecondaryIsolationGroupsBookies() throws Exception {
defaultBookieGroup.put(BOOKIE5, BookieInfo.builder().rack("rack1").build());

Map<String, BookieInfo> 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<String, BookieInfo> 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);
Expand Down
5 changes: 5 additions & 0 deletions ...r/src/test/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<BundleData> bundlesCache = pulsar1.getLocalMetadataStore().getMetadataCache(BundleData.class);
Expand Down
Loading