Skip to content

Commit 352147b

Browse files
authored
[fix][broker] Revert "[improve][broker] Enhance advertised address resolution with fallback to localhost (#25238)" (#25523)
1 parent a8e6296 commit 352147b

5 files changed

Lines changed: 6 additions & 11 deletions

File tree

pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandaloneStarter.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.commons.lang3.StringUtils;
3030
import org.apache.logging.log4j.LogManager;
3131
import org.apache.pulsar.broker.ServiceConfiguration;
32-
import org.apache.pulsar.broker.ServiceConfigurationUtils;
3332
import org.apache.pulsar.common.configuration.PulsarConfigurationLoader;
3433
import org.apache.pulsar.docs.tools.CmdGenerateDocs;
3534
import picocli.CommandLine;
@@ -92,12 +91,8 @@ public PulsarStandaloneStarter(String[] args) throws Exception {
9291
// Use advertised address from command line
9392
config.setAdvertisedAddress(this.getAdvertisedAddress());
9493
} else if (isBlank(config.getAdvertisedAddress()) && isBlank(config.getAdvertisedListeners())) {
95-
try {
96-
config.setAdvertisedAddress(ServiceConfigurationUtils.unsafeLocalhostResolve());
97-
} catch (Exception e) {
98-
log.warn("Failed to resolve FQDN, using 'localhost' as advertised address", e);
99-
config.setAdvertisedAddress("localhost");
100-
}
94+
// Use advertised address as local hostname
95+
config.setAdvertisedAddress("localhost");
10196
} else {
10297
// Use advertised or advertisedListeners address from config file
10398
}

tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/StandaloneContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public StandaloneContainer(String clusterName, String pulsarImageName) {
5252
@Override
5353
protected void configure() {
5454
super.configure();
55-
setCommand("standalone --advertised-address localhost");
55+
setCommand("standalone");
5656
addEnv("PULSAR_MEM", "-Xms128M -Xmx1g -XX:MaxDirectMemorySize=1g");
5757
}
5858

tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public PulsarContainer() {
3737
public PulsarContainer(final String pulsarVersion) {
3838
super(pulsarVersion);
3939
withExposedPorts(BROKER_HTTP_PORT, PULSAR_PORT);
40-
withCommand("/pulsar/bin/pulsar standalone --advertised-address localhost");
40+
withCommand("/pulsar/bin/pulsar standalone");
4141
waitingFor(new HttpWaitStrategy()
4242
.forPort(BROKER_HTTP_PORT)
4343
.forStatusCode(200)

tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public PulsarContainer() {
3737
public PulsarContainer(final String pulsarVersion) {
3838
super(pulsarVersion);
3939
withExposedPorts(BROKER_HTTP_PORT, PULSAR_PORT);
40-
withCommand("/pulsar/bin/pulsar standalone --advertised-address localhost");
40+
withCommand("/pulsar/bin/pulsar standalone");
4141
waitingFor(new HttpWaitStrategy()
4242
.forPort(BROKER_HTTP_PORT)
4343
.forStatusCode(200)

tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/PulsarContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public PulsarContainer() {
3737
public PulsarContainer(final String pulsarVersion) {
3838
super(pulsarVersion);
3939
withExposedPorts(BROKER_HTTP_PORT, PULSAR_PORT);
40-
withCommand("/pulsar/bin/pulsar standalone --advertised-address localhost");
40+
withCommand("/pulsar/bin/pulsar standalone");
4141
waitingFor(new HttpWaitStrategy()
4242
.forPort(BROKER_HTTP_PORT)
4343
.forStatusCode(200)

0 commit comments

Comments
 (0)