This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-4.2 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit a0420fb218b017c1d560637d063c7f86b92f2b6d Author: Zixuan Liu <[email protected]> AuthorDate: Wed Apr 15 22:49:32 2026 +0800 [fix][broker] Revert "[improve][broker] Enhance advertised address resolution with fallback to localhost (#25238)" (#25523) (cherry picked from commit 352147bff422a753fd67cf0420ad1b6e7f837e0a) --- .../src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java | 9 ++------- .../pulsar/tests/integration/containers/StandaloneContainer.java | 2 +- .../org/apache/pulsar/tests/integration/PulsarContainer.java | 2 +- .../org/apache/pulsar/tests/integration/PulsarContainer.java | 2 +- .../org/apache/pulsar/tests/integration/PulsarContainer.java | 2 +- 5 files changed, 6 insertions(+), 11 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 411449d1042..29feac8cb46 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java @@ -29,7 +29,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.pulsar.broker.ServiceConfiguration; -import org.apache.pulsar.broker.ServiceConfigurationUtils; import org.apache.pulsar.common.configuration.PulsarConfigurationLoader; import org.apache.pulsar.docs.tools.CmdGenerateDocs; import picocli.CommandLine; @@ -92,12 +91,8 @@ public class PulsarStandaloneStarter extends PulsarStandalone { // Use advertised address from command line config.setAdvertisedAddress(this.getAdvertisedAddress()); } else if (isBlank(config.getAdvertisedAddress()) && isBlank(config.getAdvertisedListeners())) { - try { - config.setAdvertisedAddress(ServiceConfigurationUtils.unsafeLocalhostResolve()); - } catch (Exception e) { - log.warn("Failed to resolve FQDN, using 'localhost' as advertised address", e); - config.setAdvertisedAddress("localhost"); - } + // Use advertised address as local hostname + config.setAdvertisedAddress("localhost"); } else { // Use advertised or advertisedListeners address from config file } diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java index 3bee66adaec..7e0b347640d 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java @@ -52,7 +52,7 @@ public class StandaloneContainer extends PulsarContainer<StandaloneContainer> { @Override protected void configure() { super.configure(); - setCommand("standalone --advertised-address localhost"); + setCommand("standalone"); addEnv("PULSAR_MEM", "-Xms128M -Xmx1g -XX:MaxDirectMemorySize=1g"); } diff --git a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java index c945fc369a9..365b4cca815 100644 --- a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java +++ b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java @@ -37,7 +37,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> { public PulsarContainer(final String pulsarVersion) { super(pulsarVersion); withExposedPorts(BROKER_HTTP_PORT, PULSAR_PORT); - withCommand("/pulsar/bin/pulsar standalone --advertised-address localhost"); + withCommand("/pulsar/bin/pulsar standalone"); waitingFor(new HttpWaitStrategy() .forPort(BROKER_HTTP_PORT) .forStatusCode(200) diff --git a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java index c945fc369a9..365b4cca815 100644 --- a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java +++ b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java @@ -37,7 +37,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> { public PulsarContainer(final String pulsarVersion) { super(pulsarVersion); withExposedPorts(BROKER_HTTP_PORT, PULSAR_PORT); - withCommand("/pulsar/bin/pulsar standalone --advertised-address localhost"); + withCommand("/pulsar/bin/pulsar standalone"); waitingFor(new HttpWaitStrategy() .forPort(BROKER_HTTP_PORT) .forStatusCode(200) diff --git a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java index c945fc369a9..365b4cca815 100644 --- a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java +++ b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java @@ -37,7 +37,7 @@ public class PulsarContainer extends GenericContainer<PulsarContainer> { public PulsarContainer(final String pulsarVersion) { super(pulsarVersion); withExposedPorts(BROKER_HTTP_PORT, PULSAR_PORT); - withCommand("/pulsar/bin/pulsar standalone --advertised-address localhost"); + withCommand("/pulsar/bin/pulsar standalone"); waitingFor(new HttpWaitStrategy() .forPort(BROKER_HTTP_PORT) .forStatusCode(200)
