This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.10 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit cd6907231713f0ce1be9e9383283371a07281d8c Author: LinChen <[email protected]> AuthorDate: Sat Jul 2 06:44:08 2022 +0800 fix select broker is none (#16316) * fix select broker is none * check style (cherry picked from commit cf4fe17d47b2b45126d1795a49641dc53ba37d19) --- .../pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java index 08620340497..65c11b76464 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java @@ -845,7 +845,11 @@ public class ModularLoadManagerImpl implements ModularLoadManager { LoadManagerShared.applyNamespacePolicies(serviceUnit, policies, brokerCandidateCache, getAvailableBrokers(), brokerTopicLoadingPredicate); - broker = placementStrategy.selectBroker(brokerCandidateCache, data, loadData, conf); + Optional<String> brokerTmp = + placementStrategy.selectBroker(brokerCandidateCache, data, loadData, conf); + if (brokerTmp.isPresent()) { + broker = brokerTmp; + } } // Add new bundle to preallocated.
