EronWright commented on a change in pull request #12056:
URL: https://github.com/apache/pulsar/pull/12056#discussion_r711207387
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
##########
@@ -398,39 +403,46 @@ public void start() throws Exception {
this.producerNameGenerator = new
DistributedIdGenerator(pulsar.getCoordinationService(),
PRODUCER_NAME_GENERATOR_PATH,
pulsar.getConfiguration().getClusterName());
- ServerBootstrap bootstrap = defaultServerBootstrap.clone();
-
ServiceConfiguration serviceConfig = pulsar.getConfiguration();
-
- bootstrap.childHandler(
- pulsarChannelInitFactory.newPulsarChannelInitializer(pulsar,
false));
-
- Optional<Integer> port = serviceConfig.getBrokerServicePort();
- if (port.isPresent()) {
- // Bind and start to accept incoming connections.
- InetSocketAddress addr = new
InetSocketAddress(pulsar.getBindAddress(), port.get());
+ List<BindAddress> bindAddresses =
BindAddressValidator.validateBindAddresses(serviceConfig,
+ Arrays.asList("pulsar", "pulsar+ssl"));
+ String internalListenerName = serviceConfig.getInternalListenerName();
+
+ // create a channel for each bind address
+ if (bindAddresses.size() == 0) {
+ throw new IllegalArgumentException("At least one broker bind
address must be configured");
+ }
+ for (BindAddress a : bindAddresses) {
+ InetSocketAddress addr = new
InetSocketAddress(a.getAddress().getHost(), a.getAddress().getPort());
+ boolean isTls = "pulsar+ssl".equals(a.getAddress().getScheme());
+ PulsarChannelInitializer.PulsarChannelOptions opts =
PulsarChannelInitializer.PulsarChannelOptions.builder()
+ .enableTLS(isTls)
+ .listenerName(a.getListenerName()).build();
+
+ ServerBootstrap b = defaultServerBootstrap.clone();
+ b.childHandler(
+
pulsarChannelInitFactory.newPulsarChannelInitializer(pulsar, opts));
try {
- listenChannel = bootstrap.bind(addr).sync().channel();
- log.info("Started Pulsar Broker service on {}",
listenChannel.localAddress());
- } catch (Exception e) {
- throw new IOException("Failed to bind Pulsar broker on " +
addr, e);
- }
- }
+ Channel ch = b.bind(addr).sync().channel();
+ listenChannels.add(ch);
+
+ // identify the primary channel. Note that the legacy bindings
appear first and have no listener.
+ if (StringUtils.isBlank(a.getListenerName())
+ || StringUtils.equalsIgnoreCase(a.getListenerName(),
internalListenerName)) {
+ if (this.listenChannel == null && !isTls) {
+ this.listenChannel = ch;
+ }
+ if (this.listenChannelTls == null && isTls) {
+ this.listenChannelTls = ch;
+ }
+ }
- Optional<Integer> tlsPort = serviceConfig.getBrokerServicePortTls();
- if (tlsPort.isPresent()) {
- ServerBootstrap tlsBootstrap = bootstrap.clone();
Review comment:
An oddity in the old code is that `bootstrap` is cloned here, though it
has the non-TLS child handler attached already. I assume the handler is
replaced. I would expect the `defaultServerBootstrap` to be cloned, rather
than taking a clone of a clone. See new code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
