This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.8 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 7a4691a577996380a9ed6116f58724b85b7c31c7 Author: 包子 <[email protected]> AuthorDate: Thu Jan 13 00:27:33 2022 +0800 Fix getInternalStats occasional lack of LeaderInfo (#13656) AdminApiTest is flaky. The testGetPartitionedStatsInternal test method fails sporadically. The root cause it that `stateFuture` is returned, but `availableBookiesFuture` is not accomplished, so we need ensure that `futures` is all completed before `stateFuture.complete`. https://github.com/apache/pulsar/blob/5faae1c4e683f4796ad34c1c612de0bcfe754d2a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java#L2176-L2178 (cherry picked from commit dcf01e910a4f8d30cd86ab95ab800952af92692a) --- .../org/apache/pulsar/broker/service/persistent/PersistentTopic.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java index 87728a8..52beacd 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java @@ -1981,8 +1981,9 @@ public class PersistentTopic extends AbstractTopic stats.state = ml.getState().toString(); stats.ledgers = Lists.newArrayList(); - List<CompletableFuture<String>> futures = includeLedgerMetadata ? Lists.newArrayList() : null; + List<CompletableFuture<String>> futures = Lists.newArrayList(); CompletableFuture<Set<String>> availableBookiesFuture = brokerService.pulsar().getAvailableBookiesAsync(); + futures.add(availableBookiesFuture.handle((strings, throwable) -> null)); availableBookiesFuture.whenComplete((bookies, e) -> { if (e != null) { log.error("[{}] Failed to fetch available bookies.", topic, e); @@ -1995,7 +1996,7 @@ public class PersistentTopic extends AbstractTopic info.size = li.getSize(); info.offloaded = li.hasOffloadContext() && li.getOffloadContext().getComplete(); stats.ledgers.add(info); - if (futures != null) { + if (includeLedgerMetadata) { futures.add(ml.getLedgerMetadata(li.getLedgerId()).handle((lMetadata, ex) -> { if (ex == null) { info.metadata = lMetadata;
