[pulsar] branch branch-3.0 updated: [fix][broker] Use user-specified bundle size on creating a namespace anti-affinity group with the default local policies (#20327)

[yubiao]

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

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


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new a72fbfe8f3a [fix][broker] Use user-specified bundle size on creating a 
namespace anti-affinity group with the default local policies (#20327)
a72fbfe8f3a is described below

commit a72fbfe8f3a5f938efe7111a46e74ea2716f4e45
Author: Raghavender Mittapalli <14803749+syk-co...@users.noreply.github.com>
AuthorDate: Thu May 18 09:10:25 2023 +0530

    [fix][broker] Use user-specified bundle size on creating a namespace 
anti-affinity group with the default local policies (#20327)
    
    (cherry picked from commit 908d0b3f459167a3c3df2a85c23096df336427da)
---
 .../java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 8c72d0b0286..97029eb5ce1 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
@@ -1710,7 +1710,8 @@ public abstract class NamespacesBase extends 
AdminResource {
         try {
             return getLocalPolicies()
                     .getLocalPolicies(namespaceName)
-                    .orElse(new LocalPolicies()).namespaceAntiAffinityGroup;
+                    .orElseGet(() -> new 
LocalPolicies(getBundles(config().getDefaultNumberOfNamespaceBundles())
+                            , null, null)).namespaceAntiAffinityGroup;
         } catch (Exception e) {
             log.error("[{}] Failed to get the antiAffinityGroup of namespace 
{}", clientAppId(), namespaceName, e);
             throw new RestException(Status.NOT_FOUND, "Couldn't find namespace 
policies");
@@ -1760,7 +1761,9 @@ public abstract class NamespacesBase extends 
AdminResource {
                     throw new RuntimeException(e);
                 }
 
-                String storedAntiAffinityGroup = policies.orElse(new 
LocalPolicies()).namespaceAntiAffinityGroup;
+                String storedAntiAffinityGroup = policies.orElseGet(() ->
+                        new 
LocalPolicies(getBundles(config().getDefaultNumberOfNamespaceBundles()),
+                                null, null)).namespaceAntiAffinityGroup;
                 return 
antiAffinityGroup.equalsIgnoreCase(storedAntiAffinityGroup);
             }).collect(Collectors.toList());