This is an automated email from the ASF dual-hosted git repository. sijie pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/branch-2.1 by this push: new b88d087 set worker port to be broker service port when running worker with broker (#2218) b88d087 is described below commit b88d087a87b4d26f901408b31a41e77597ead41e Author: Boyang Jerry Peng <jerry.boyang.p...@gmail.com> AuthorDate: Tue Jul 24 01:54:07 2018 -0700 set worker port to be broker service port when running worker with broker (#2218) The port for the function worker should be same as the broker service port when the worker service is run as part of the broker --- pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java | 1 + pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java | 1 + 2 files changed, 2 insertions(+) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java index 24e3fda..42e5f6e 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java @@ -156,6 +156,7 @@ public class PulsarBrokerStarter { String hostname = ServiceConfigurationUtils.getDefaultOrConfiguredAddress( brokerConfig.getAdvertisedAddress()); workerConfig.setWorkerHostname(hostname); + workerConfig.setWorkerPort(brokerConfig.getWebServicePort()); workerConfig.setWorkerId( "c-" + brokerConfig.getClusterName() + "-fw-" + hostname diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java index 28e839b..3e44f76 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java @@ -276,6 +276,7 @@ public class PulsarStandalone implements AutoCloseable { String hostname = ServiceConfigurationUtils.getDefaultOrConfiguredAddress( config.getAdvertisedAddress()); workerConfig.setWorkerHostname(hostname); + workerConfig.setWorkerPort(config.getWebServicePort()); workerConfig.setWorkerId( "c-" + config.getClusterName() + "-fw-" + hostname