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

[fix][broker] topic policy deadlock block metadata thread. #23786

Merged
merged 9 commits into from
Dec 30, 2024
Merged

[fix][broker] topic policy deadlock block metadata thread. #23786

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
14d1dc0
[fix][broker] Fix topic policies deadlock
mattisonchao Dec 26, 2024
7c7de91
add comments
mattisonchao Dec 26, 2024
a7f7de2
fix checkstyle
mattisonchao Dec 26, 2024
42cfb7f
remove useless import
mattisonchao Dec 26, 2024
356c876
add protection
mattisonchao Dec 26, 2024
52ab2d1
apply comment
mattisonchao Dec 26, 2024
3f2a838
avoid allocat useless object
mattisonchao Dec 26, 2024
bacc578
fix recursive update
mattisonchao Dec 26, 2024
646772a
move the log
mattisonchao Dec 26, 2024
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
55 changes: 27 additions & 28 deletions .../src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
import javax.annotation.Nonnull;
import org.apache.commons.lang3.concurrent.ConcurrentInitializer;
import org.apache.commons.lang3.concurrent.LazyInitializer;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.namespace.NamespaceBundleOwnershipListener;
Expand Down Expand Up @@ -267,37 +270,33 @@ public CompletableFuture<Optional<TopicPolicies>> getTopicPoliciesAsync(TopicNam
return CompletableFuture.completedFuture(Optional.empty());
}
final CompletableFuture<Boolean> preparedFuture = prepareInitPoliciesCacheAsync(topicName.getNamespaceObject());
final var resultFuture = new CompletableFuture<Optional<TopicPolicies>>();
preparedFuture.thenAccept(inserted -> policyCacheInitMap.compute(namespace, (___, existingFuture) -> {
if (!inserted || existingFuture != null) {
final var partitionedTopicName = TopicName.get(topicName.getPartitionedTopicName());
final var policies = Optional.ofNullable(switch (type) {
case DEFAULT -> Optional.ofNullable(policiesCache.get(partitionedTopicName))
.orElseGet(() -> globalPoliciesCache.get(partitionedTopicName));
case GLOBAL_ONLY -> globalPoliciesCache.get(partitionedTopicName);
case LOCAL_ONLY -> policiesCache.get(partitionedTopicName);
});
resultFuture.complete(policies);
} else {
CompletableFuture.runAsync(() -> {
log.info("The future of {} has been removed from cache, retry getTopicPolicies again", namespace);
// Call it in another thread to avoid recursive update because getTopicPoliciesAsync() could call
// policyCacheInitMap.computeIfAbsent()
getTopicPoliciesAsync(topicName, type).whenComplete((result, e) -> {
if (e == null) {
resultFuture.complete(result);
} else {
resultFuture.completeExceptionally(e);
}
// switch thread to avoid potential metadata thread cost and recursive deadlock
return preparedFuture.thenComposeAsync(inserted -> {
// initialized : policies
final Mutable<Pair<Boolean, Optional<TopicPolicies>>> policiesFutureHolder = new MutableObject<>();
// NOTICE: avoid using any callback with lock scope to avoid deadlock
policyCacheInitMap.compute(namespace, (___, existingFuture) -> {
if (!inserted || existingFuture != null) {
final var partitionedTopicName = TopicName.get(topicName.getPartitionedTopicName());
final var policies = Optional.ofNullable(switch (type) {
case DEFAULT -> Optional.ofNullable(policiesCache.get(partitionedTopicName))
.orElseGet(() -> globalPoliciesCache.get(partitionedTopicName));
case GLOBAL_ONLY -> globalPoliciesCache.get(partitionedTopicName);
case LOCAL_ONLY -> policiesCache.get(partitionedTopicName);
});
});
policiesFutureHolder.setValue(Pair.of(true, policies));
} else {
policiesFutureHolder.setValue(Pair.of(false, null));
}
return existingFuture;
});
final var p = policiesFutureHolder.getValue();
if (!p.getLeft()) {
log.info("The future of {} has been removed from cache, retry getTopicPolicies again", namespace);
return getTopicPoliciesAsync(topicName, type);
}
return existingFuture;
})).exceptionally(e -> {
resultFuture.completeExceptionally(e);
return null;
return CompletableFuture.completedFuture(p.getRight());
});
return resultFuture;
}

public void addOwnedNamespaceBundleAsync(NamespaceBundle namespaceBundle) {
Expand Down
Loading