[pulsar] branch branch-2.10 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.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git


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

commit 976c2c3469175a92d56819853fded59776b80b06
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 6e9ecf2f741..ae7f36ad191 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
@@ -1138,7 +1138,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 ca52773faf7..6a9ec94de84 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
@@ -150,6 +150,7 @@ public class BrokerBookieIsolationTest {
         config.setBrokerServicePort(Optional.of(0));
         config.setAdvertisedAddress("localhost");
         
config.setBookkeeperClientIsolationGroups(brokerBookkeeperClientIsolationGroups);
+        config.setDefaultNumberOfNamespaceBundles(8);
 
         config.setManagedLedgerDefaultEnsembleSize(2);
         config.setManagedLedgerDefaultWriteQuorum(2);
@@ -201,6 +202,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);
         } catch (PulsarAdminException.NotFoundException e) {