[pulsar] branch master updated: fix incorrect split (#14236)

[mmerli]

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

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new c0a0b14  fix incorrect split (#14236)
c0a0b14 is described below

commit c0a0b1418ea397f55f38c2caf700add4fbe0cddf
Author: gaozhangmin <gaozhangmin...@qq.com>
AuthorDate: Sat Feb 12 00:02:12 2022 +0800

    fix incorrect split (#14236)
    
    Co-authored-by: gavingaozhangmin <gavingaozhang...@didiglobal.com>
---
 .../main/java/org/apache/pulsar/PulsarStandaloneStarter.java | 12 +++++++++++-
 .../configurations/pulsar_broker_test_standalone.conf        |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java 
b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java
index 3afab5f..92b3e3e 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java
@@ -87,7 +87,17 @@ public class PulsarStandaloneStarter extends 
PulsarStandalone {
         // Priority: args > conf > default
         if (!argsContains(args, "--zookeeper-port")) {
             if (StringUtils.isNotBlank(config.getMetadataStoreUrl())) {
-                
this.setZkPort(Integer.parseInt(config.getMetadataStoreUrl().split(":")[1]));
+                String[] metadataStoreUrl = 
config.getMetadataStoreUrl().split(",")[0].split(":");
+                if (metadataStoreUrl.length == 2) {
+                    this.setZkPort(Integer.parseInt(metadataStoreUrl[1]));
+                } else if ((metadataStoreUrl.length == 3)){
+                    String zkPort = metadataStoreUrl[2];
+                    if (zkPort.contains("/")) {
+                        this.setZkPort(Integer.parseInt(zkPort.substring(0, 
zkPort.lastIndexOf("/"))));
+                    } else {
+                        this.setZkPort(Integer.parseInt(zkPort));
+                    }
+                }
             }
         }
         config.setZookeeperServers(zkServers + ":" + this.getZkPort());
diff --git 
a/pulsar-broker/src/test/resources/configurations/pulsar_broker_test_standalone.conf
 
b/pulsar-broker/src/test/resources/configurations/pulsar_broker_test_standalone.conf
index 901193a..c733409 100644
--- 
a/pulsar-broker/src/test/resources/configurations/pulsar_broker_test_standalone.conf
+++ 
b/pulsar-broker/src/test/resources/configurations/pulsar_broker_test_standalone.conf
@@ -18,8 +18,8 @@
 #
 
 applicationName="pulsar_broker"
-zookeeperServers=
-configurationStoreServers="localhost"
+metadataStoreUrl="zk:localhost:2181/ledger"
+configurationMetadataStoreUrl="zk:localhost:2181"
 brokerServicePort=6650
 brokerServicePortTls=6651
 webServicePort=8080