BewareMyPower commented on code in PR #22485:
URL: https://github.com/apache/pulsar/pull/22485#discussion_r1562248320
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java:
##########
@@ -496,30 +496,42 @@ public CompletableFuture<Optional<BrokerLookupData>>
assign(Optional<ServiceUnit
if (topic.isPresent() && isInternalTopic(topic.get().toString())) {
owner = serviceUnitStateChannel.getChannelOwnerAsync();
} else {
- String candidateBrokerId =
getHeartbeatOrSLAMonitorBrokerId(serviceUnit);
- if (candidateBrokerId != null) {
- owner =
CompletableFuture.completedFuture(Optional.of(candidateBrokerId));
- } else {
- owner = getOrSelectOwnerAsync(serviceUnit,
bundle).thenApply(Optional::ofNullable);
- }
+ owner =
getHeartbeatOrSLAMonitorBrokerId(serviceUnit).thenCompose(candidateBrokerId -> {
+ if (candidateBrokerId != null) {
+ return
CompletableFuture.completedFuture(Optional.of(candidateBrokerId));
+ }
+ return getOrSelectOwnerAsync(serviceUnit,
bundle).thenApply(Optional::ofNullable);
+ });
}
return getBrokerLookupData(owner, bundle);
});
}
- private String getHeartbeatOrSLAMonitorBrokerId(ServiceUnitId serviceUnit)
{
+ private CompletableFuture<String>
getHeartbeatOrSLAMonitorBrokerId(ServiceUnitId serviceUnit) {
// Check if this is Heartbeat or SLAMonitor namespace
String candidateBroker =
NamespaceService.checkHeartbeatNamespace(serviceUnit);
- if (candidateBroker == null) {
- candidateBroker =
NamespaceService.checkHeartbeatNamespaceV2(serviceUnit);
+ if (candidateBroker != null) {
+ return CompletableFuture.completedFuture(candidateBroker);
}
- if (candidateBroker == null) {
- candidateBroker =
NamespaceService.getSLAMonitorBrokerName(serviceUnit);
+ candidateBroker =
NamespaceService.checkHeartbeatNamespaceV2(serviceUnit);
+ if (candidateBroker != null) {
+ return CompletableFuture.completedFuture(candidateBroker);
}
+ candidateBroker =
NamespaceService.getSLAMonitorBrokerName(serviceUnit);
if (candidateBroker != null) {
- return candidateBroker.substring(candidateBroker.lastIndexOf('/')
+ 1);
+ // Check if the broker is available
+ final String finalCandidateBroker = candidateBroker;
+ return
brokerRegistry.lookupAsync(candidateBroker).thenApply(brokerLookupData -> {
+ if (brokerLookupData.isEmpty()) {
+ if (debug(conf, log)) {
+ log.info("The SLA Monitor broker {} is not
available.", finalCandidateBroker);
Review Comment:
I see the same pattern in other places (e.g. `createSystemTopic`), so mark
it as resolved
--
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: commits-unsubscr...@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
