[pulsar] branch branch-2.11 updated: [fix][broker] Fix default bundle size used while setting bookie affinity (#20250)

[technoboy]

This is an automated email from the ASF dual-hosted git repository.

technoboy pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.11 by this push:
     new a6ed1cc45e5 [fix][broker] Fix default bundle size used while setting 
bookie affinity (#20250)
a6ed1cc45e5 is described below

commit a6ed1cc45e5c71180f2c565ca1100e83c43b0d0c
Author: Raghavender Mittapalli <14803749+syk-co...@users.noreply.github.com>
AuthorDate: Wed May 10 18:05:17 2023 +0530

    [fix][broker] Fix default bundle size used while setting bookie affinity 
(#20250)
---
 .../main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java | 2 +-
 .../org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
index f76e8a02827..610b799fba6 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -1099,7 +1099,7 @@ public abstract class NamespacesBase extends 
AdminResource {
                         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(),
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
index e575154a743..accf8361824 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBookieIsolationTest.java
@@ -154,6 +154,7 @@ public class BrokerBookieIsolationTest {
         config.setBrokerServicePort(Optional.of(0));
         config.setAdvertisedAddress("localhost");
         
config.setBookkeeperClientIsolationGroups(brokerBookkeeperClientIsolationGroups);
+        config.setDefaultNumberOfNamespaceBundles(8);
 
         config.setManagedLedgerDefaultEnsembleSize(2);
         config.setManagedLedgerDefaultWriteQuorum(2);
@@ -205,6 +206,9 @@ public class BrokerBookieIsolationTest {
                         
.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");