(pulsar) branch branch-3.1 updated: [fix][broker] PulsarStandalone started with error if --stream-storage-port is not 4181 (#22993)

[zixuan]

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

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


The following commit(s) were added to refs/heads/branch-3.1 by this push:
     new 0753a2c9825 [fix][broker] PulsarStandalone started with error if 
--stream-storage-port is not 4181 (#22993)
0753a2c9825 is described below

commit 0753a2c9825ec594bec231b3fa7d967a26659d94
Author: zhouyifan279 <88070094+zhouyifan...@users.noreply.github.com>
AuthorDate: Mon Jul 8 14:47:24 2024 +0800

    [fix][broker] PulsarStandalone started with error if --stream-storage-port 
is not 4181 (#22993)
    
    (cherry picked from commit 17e3f860b050443de74413c1d0b4a3d47173f68a)
---
 .../apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java |  2 +-
 .../pulsar/zookeeper/LocalBookkeeperEnsembleTest.java    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
index 63d146a3a15..032610a3249 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
@@ -358,7 +358,7 @@ public class LocalBookkeeperEnsemble {
         // create a default namespace
         try (StorageAdminClient admin = StorageClientBuilder.newBuilder()
              .withSettings(StorageClientSettings.newBuilder()
-                 .serviceUri("bk://localhost:4181")
+                 .serviceUri("bk://localhost:" + streamStoragePort)
                  .backoffPolicy(Backoff.Jitter.of(
                      Type.EXPONENTIAL,
                      1000,
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
index a4bc69a7266..bfbdf675bd8 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
@@ -21,6 +21,8 @@ package org.apache.pulsar.zookeeper;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
+
+import org.apache.bookkeeper.conf.ServerConfiguration;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -54,4 +56,18 @@ public class LocalBookkeeperEnsembleTest {
         assertFalse(ensemble.getZkClient().getState().isConnected());
         assertFalse(ensemble.getBookies()[0].isRunning());
     }
+
+    @Test(timeOut = 10_000)
+    public void testStartWithSpecifiedStreamStoragePort() throws Exception {
+        LocalBookkeeperEnsemble ensemble = null;
+        try {
+            ensemble =
+                    new LocalBookkeeperEnsemble(1, 0, 0, 4182, null, null, 
true, null);
+            ensemble.startStandalone(new ServerConfiguration(), true);
+        } finally {
+            if (ensemble != null) {
+                ensemble.stop();
+            }
+        }
+    }
 }