Skip to content
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

[improve][broker] Avoid using blocking calls for the async method checkTopicOwnership #15023

Merged
merged 3 commits into from
Apr 6, 2022
Merged

[improve][broker] Avoid using blocking calls for the async method checkTopicOwnership #15023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90e4af3
[improve][broker] Avoid using blocking calls for the async method "ch…
mattisonchao Apr 4, 2022
9d5e59b
Fix test
mattisonchao Apr 5, 2022
ee59801
Fix checkstyle
mattisonchao Apr 5, 2022
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
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ private CompletableFuture<Boolean> isTopicOwnedAsync(TopicName topic) {

public CompletableFuture<Boolean> checkTopicOwnership(TopicName topicName) {
return getBundleAsync(topicName)
.thenApply(ownershipCache::checkOwnership);
.thenCompose(ownershipCache::checkOwnershipAsync);
}

public void removeOwnedServiceUnit(NamespaceBundle nsBundle) throws Exception {
Expand Down
13 changes: 11 additions & 2 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnershipCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,13 @@ public OwnershipCache(PulsarService pulsar, NamespaceBundleFactory bundleFactory
* @param bundle namespace bundle
* @return future that will complete with check result
*/
public boolean checkOwnership(NamespaceBundle bundle) {
return getOwnedBundle(bundle) != null;
public CompletableFuture<Boolean> checkOwnershipAsync(NamespaceBundle bundle) {
Optional<CompletableFuture<OwnedBundle>> ownedBundleFuture = getOwnedBundleAsync(bundle);
if (!ownedBundleFuture.isPresent()) {
return CompletableFuture.completedFuture(false);
}
return ownedBundleFuture.get()
.thenApply(bd -> bd != null && bd.isActive());
}

/**
Expand Down Expand Up @@ -279,6 +284,10 @@ public OwnedBundle getOwnedBundle(NamespaceBundle bundle) {
}
}

public Optional<CompletableFuture<OwnedBundle>> getOwnedBundleAsync(NamespaceBundle bundle) {
return Optional.ofNullable(ownedBundlesCache.getIfPresent(bundle));
}

/**
* Disable bundle in local cache and on zk.
*
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/OwnershipCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ public void testReestablishOwnership() throws Exception {
assertFalse(data3.isDisabled());
assertNotNull(cache.getOwnedBundle(testFullBundle));

assertTrue(cache.checkOwnership(testFullBundle));
assertTrue(cache.checkOwnershipAsync(testFullBundle).get());
assertEquals(data2.getNativeUrl(), selfBrokerUrl);
assertFalse(data2.isDisabled());
assertNotNull(cache.getOwnedBundle(testFullBundle));
Expand Down