[pulsar-broker] Fix bug that namespace policies does not take effect due to NPE #5408
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
retest this please |
rdhabalia
approved these changes
Oct 17, 2019
merlimat
reviewed
Oct 17, 2019
Comment on lines
1375
to
1377
| if (dispatcher != null && dispatcher.getRateLimiter().isPresent()) { | ||
| dispatcher.getRateLimiter().get().updateDispatchRate(); | ||
| } |
There was a problem hiding this comment.
To make it even more sure, can we do like:
Dispatcher dispatcher = persistentSubscription.getDispatcher();
if (dispatcher != null) {
dispatcher.getRateLimiter().ifPresent(DispatchRateLimiter::updateDispatchRate);
}| @@ -1673,7 +1676,7 @@ private boolean shouldTopicBeRetained() { | |||
| }); | |||
| subscriptions.forEach((subName, sub) -> { | |||
| sub.getConsumers().forEach(Consumer::checkPermissions); | |||
| if (sub.getDispatcher().getRateLimiter().isPresent()) { | |||
| if (sub.getDispatcher() != null && sub.getDispatcher().getRateLimiter().isPresent()) { | |||
There was a problem hiding this comment.
Same as above, protect against dispatcher turning null
| subscription.getDispatcher().initializeDispatchRateLimiterIfNeeded(policies)); | ||
| subscriptions.forEach((name, subscription) -> { | ||
| if (subscription.getDispatcher() != null) { | ||
| subscription.getDispatcher().initializeDispatchRateLimiterIfNeeded(policies); |
There was a problem hiding this comment.
Same as above, protect against dispatcher turning null in between checks
|
@merlimat Addressed your comments. PTAL |
|
retest this please |
codelipenghui
approved these changes
Oct 20, 2019
|
run Integration tests |
2 similar comments
|
run Integration tests |
|
run Integration tests |
|
rerun integration tests |
2 similar comments
|
rerun integration tests |
|
rerun integration tests |
nkurihar
approved these changes
Oct 23, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
When produce/consume permissions for a role on a namespace are revoked, producers and consumers connected to the topic under the namespace using that role should be disconnected from the broker. However, I noticed that producers/consumers can stay connected in some topics even if the permissions are revoked.
As a result of the investigation, I found that NPE was thrown in the following line:
pulsar/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
Line 273 in 094ebf7
In subscriptions that consumer has never connected to since the broker started, the dispatcher has not been initialized, so
subscription.getDispatcher()returns null.As a result, the process of
PersistentTopic#onPoliciesUpdate()is aborted.pulsar/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
Lines 1668 to 1682 in 094ebf7
Modifications
Before calling a dispatcher method, make sure that the dispatcher is not null.