Skip to content

Commit f72b25f

Browse files
committed
Revert "replaced optional"
This reverts commit 2e8eb09.
1 parent 55aabce commit f72b25f

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.common.annotations.VisibleForTesting;
2727
import java.io.IOException;
2828
import java.util.ArrayList;
29-
import java.util.Collections;
3029
import java.util.HashMap;
3130
import java.util.List;
3231
import java.util.Map;
@@ -381,19 +380,19 @@ public CompletableFuture<Optional<BrokerLookupData>> assign(Optional<ServiceUnit
381380
}
382381

383382
public CompletableFuture<Optional<String>> selectAsync(ServiceUnitId bundle) {
384-
return selectAsync(bundle, Collections.emptySet());
383+
return selectAsync(bundle, Optional.empty());
385384
}
386385

387386
public CompletableFuture<Optional<String>> selectAsync(ServiceUnitId bundle,
388-
Set<String> excludeBrokerSet) {
387+
Optional<Set<String>> excludeBrokerSet) {
389388
BrokerRegistry brokerRegistry = getBrokerRegistry();
390389
return brokerRegistry.getAvailableBrokerLookupDataAsync()
391390
.thenCompose(availableBrokers -> {
392391
LoadManagerContext context = this.getContext();
393392

394393
Map<String, BrokerLookupData> availableBrokerCandidates = new HashMap<>(availableBrokers);
395-
if (!excludeBrokerSet.isEmpty()) {
396-
for (String exclude : excludeBrokerSet) {
394+
if (excludeBrokerSet.isPresent()) {
395+
for (String exclude : excludeBrokerSet.get()) {
397396
availableBrokerCandidates.remove(exclude);
398397
}
399398
}

pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ private synchronized void doCleanup(String broker) {
12651265

12661266
private Optional<String> selectBroker(String serviceUnit, String inactiveBroker) {
12671267
try {
1268-
return loadManager.selectAsync(getNamespaceBundle(serviceUnit), Set.of(inactiveBroker))
1268+
return loadManager.selectAsync(getNamespaceBundle(serviceUnit), Optional.of(Set.of(inactiveBroker)))
12691269
.get(inFlightStateWaitingTimeInMillis, MILLISECONDS);
12701270
} catch (Throwable e) {
12711271
log.error("Failed to select a broker for serviceUnit:{}", serviceUnit);

0 commit comments

Comments
 (0)