Skip to content

[fix][broker] Fix default bundle size used while setting bookie affinity #1

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

Open
syk-coder wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[fix][broker] Fix default bundle size used while setting bookie affinity #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d051387
Fix default bundle size while setting bookie affinity
syk-coder May 8, 2023
0bb64c2
ns1 is expected to not have IG set, so using ns2 for testing bundle size
syk-coder May 9, 2023
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
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ protected void internalSetBookieAffinityGroup(BookieAffinityGroupData bookieAffi
policies -> new LocalPolicies(policies.bundles,
bookieAffinityGroup,
policies.namespaceAntiAffinityGroup))
.orElseGet(() -> new LocalPolicies(defaultBundle(),
.orElseGet(() -> new LocalPolicies(getBundles(config().getDefaultNumberOfNamespaceBundles()),
bookieAffinityGroup,
null));
log.info("[{}] Successfully updated local-policies configuration: namespace={}, map={}", clientAppId(),
Expand Down
4 changes: 4 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ public void testBookieIsolation() throws Exception {
config.setBrokerServicePort(Optional.of(0));
config.setAdvertisedAddress("localhost");
config.setBookkeeperClientIsolationGroups(brokerBookkeeperClientIsolationGroups);
config.setDefaultNumberOfNamespaceBundles(8);

config.setManagedLedgerDefaultEnsembleSize(2);
config.setManagedLedgerDefaultWriteQuorum(2);
Expand Down Expand Up @@ -207,6 +208,9 @@ public void testBookieIsolation() throws Exception {
.bookkeeperAffinityGroupPrimary(tenantNamespaceIsolationGroups)
.build());

//Checks the namespace bundles after setting the bookie affinity
assertEquals(admin.namespaces().getBundles(ns2).getNumBundles(), config.getDefaultNumberOfNamespaceBundles());

try {
admin.namespaces().getBookieAffinityGroup(ns1);
fail("ns1 should have no bookie affinity group set");
Expand Down