Skip to content

[improve][broker] Avoid blocking joins in ClusterResources sync APIs #26295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VedantMadane wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[improve][broker] Avoid blocking joins in ClusterResources sync APIs #26295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f40081b
[improve][broker] Avoid blocking joins in ClusterResources sync APIs
VedantMadane Aug 9, 2026
eacf619
Trigger CI recalculation
VedantMadane Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 31 additions & 10 deletions pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ClusterResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -71,8 +73,21 @@ public CompletableFuture<Optional<ClusterData>> getClusterAsync(String clusterNa
return getAsync(joinPath(BASE_CLUSTERS_PATH, clusterName));
}

public CompletableFuture<List<String>> getNamespacesForClusterAsync(String tenant, String clusterName) {
return getChildrenAsync(joinPath(BASE_POLICIES_PATH, tenant, clusterName));
}

public List<String> getNamespacesForCluster(String tenant, String clusterName) throws MetadataStoreException {
return getChildren(joinPath(BASE_POLICIES_PATH, tenant, clusterName));
try {
return getNamespacesForClusterAsync(tenant, clusterName)
.get(getOperationTimeoutSec(), TimeUnit.SECONDS);
} catch (ExecutionException e) {
throw (e.getCause() instanceof MetadataStoreException) ? (MetadataStoreException) e.getCause()
: new MetadataStoreException(e.getCause());
} catch (Exception e) {
throw new MetadataStoreException(
"Failed to get namespaces for tenant " + tenant + " in cluster " + clusterName, e);
}
}

public void createCluster(String clusterName, ClusterData clusterData) throws MetadataStoreException {
Expand Down Expand Up @@ -109,22 +124,28 @@ public CompletableFuture<Boolean> isClusterUsedAsync(String clusterName) {
.collect(Collectors.toList());
return FutureUtil.waitForAll(futures)
.thenApply(__ -> {
// We found a tenant that has at least a namespace in this cluster
return futures.stream().map(CompletableFuture::join)
// Futures are already complete after waitForAll; use getNow to avoid
// accidental blocking if this is ever refactored.
return futures.stream()
.map(f -> f.getNow(List.of()))
.anyMatch(CollectionUtils::isNotEmpty);
});
});
}

/**
* Synchronous wrapper around {@link #isClusterUsedAsync(String)}.
* Prefer the async method so callers do not block metadata store threads.
*/
public boolean isClusterUsed(String clusterName) throws MetadataStoreException {
for (String tenant : getCache().getChildren(BASE_POLICIES_PATH).join()) {
if (!getCache().getChildren(joinPath(BASE_POLICIES_PATH, tenant, clusterName)).join().isEmpty()) {
// We found a tenant that has at least a namespace in this cluster
return true;
}
try {
return isClusterUsedAsync(clusterName).get(getOperationTimeoutSec(), TimeUnit.SECONDS);
} catch (ExecutionException e) {
throw (e.getCause() instanceof MetadataStoreException) ? (MetadataStoreException) e.getCause()
: new MetadataStoreException(e.getCause());
} catch (Exception e) {
throw new MetadataStoreException("Failed to check if cluster is used: " + clusterName, e);
}

return false;
}

public boolean clusterExists(String clusterName) throws MetadataStoreException {
Expand Down