You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by "dao-jun (via GitHub)" <gi...@apache.org> on 2025/03/04 05:11:12 UTC
[PR] [fix] Fix UnsupportedOperationException when update topic policies [pulsar]
dao-jun opened a new pull request, #24048:
URL: https://github.com/apache/pulsar/pull/24048
Fixes #24043
### Motivation
Fixes #24043
### Modifications
<!-- Describe the modifications you've done. -->
### Verifying this change
- [ ] Make sure that the change passes the CI checks.
*(Please pick either of the following options)*
This change is a trivial rework / code cleanup without any test coverage.
*(or)*
This change is already covered by existing tests, such as *(please describe tests)*.
*(or)*
This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end deployment with large payloads (10MB)*
- *Extended integration test for recovery after broker failure*
### Does this pull request potentially affect one of the following parts:
<!-- DO NOT REMOVE THIS SECTION. CHECK THE PROPER BOX ONLY. -->
*If the box was checked, please highlight the changes*
- [ ] Dependencies (add or upgrade a dependency)
- [ ] The public API
- [ ] The schema
- [ ] The default values of configurations
- [ ] The threading model
- [ ] The binary protocol
- [ ] The REST endpoints
- [ ] The admin CLI options
- [ ] The metrics
- [ ] Anything that affects deployment
### Documentation
<!-- DO NOT REMOVE THIS SECTION. CHECK THE PROPER BOX ONLY. -->
- [ ] `doc` <!-- Your PR contains doc changes. -->
- [ ] `doc-required` <!-- Your PR changes impact docs and you will update later -->
- [x] `doc-not-needed` <!-- Your PR changes do not impact docs -->
- [ ] `doc-complete` <!-- Docs have been already added -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [fix] Fix UnsupportedOperationException when update topic policies [pulsar]
Posted by "dao-jun (via GitHub)" <gi...@apache.org>.
dao-jun commented on code in PR #24048:
URL: https://github.com/apache/pulsar/pull/24048#discussion_r1993759826
##########
pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java:
##########
@@ -3229,4 +3231,17 @@ public void testUpdateRetentionWithPartialFailure() throws Exception {
admin.namespaces().removeRetention(myNamespace);
admin.topics().delete(tpName, false);
}
+
+ @Test
+ public void testTopicPoliciesGetSubscriptionPolicies() throws Exception {
+ TopicPolicies topicPolicies = TopicPolicies.builder()
+ .maxProducerPerTopic(10).subscriptionPolicies(null).build();
+ Assert.assertNotNull(topicPolicies.getSubscriptionPolicies());
+ Assert.assertEquals(topicPolicies.getMaxProducerPerTopic(), 10);
+ Assert.assertTrue(topicPolicies.getSubscriptionPolicies().isEmpty());
+ topicPolicies.getSubscriptionPolicies().computeIfAbsent("sub", k ->
+ new SubscriptionPolicies()).setDispatchRate(new DispatchRateImpl());
Review Comment:
This issue most likely caused by deserialization, so I code the test like this.
I will keep the test, and so, add new tests with calling admin API
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [fix] Fix UnsupportedOperationException when update topic policies [pulsar]
Posted by "BewareMyPower (via GitHub)" <gi...@apache.org>.
BewareMyPower commented on code in PR #24048:
URL: https://github.com/apache/pulsar/pull/24048#discussion_r1979317995
##########
pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java:
##########
@@ -3229,4 +3231,17 @@ public void testUpdateRetentionWithPartialFailure() throws Exception {
admin.namespaces().removeRetention(myNamespace);
admin.topics().delete(tpName, false);
}
+
+ @Test
+ public void testTopicPoliciesGetSubscriptionPolicies() throws Exception {
+ TopicPolicies topicPolicies = TopicPolicies.builder()
+ .maxProducerPerTopic(10).subscriptionPolicies(null).build();
+ Assert.assertNotNull(topicPolicies.getSubscriptionPolicies());
+ Assert.assertEquals(topicPolicies.getMaxProducerPerTopic(), 10);
+ Assert.assertTrue(topicPolicies.getSubscriptionPolicies().isEmpty());
+ topicPolicies.getSubscriptionPolicies().computeIfAbsent("sub", k ->
+ new SubscriptionPolicies()).setDispatchRate(new DispatchRateImpl());
Review Comment:
Could you replace it with an admin call? The original issue is reproduced by the `bin\pulsar-admin topicPolicies set-subscription-dispatch-rate` command to trigger the `computeIfAbsent` call:
```
**java.lang.UnsupportedOperationException**
at java.base/java.util.Collections$EmptyMap.**computeIfAbsent**(Collections.java:4764)
at org.apache.pulsar.broker.admin.impl.PersistentTopicsBase.lambda$**internalSetSubscriptionLevelDispatchRate**$487(PersistentTopicsBase.java:4960)
```
but the test code just test `computeIfAbsent` directly. If the code of `internalSetSubscriptionLevelDispatchRate` changed, this test would be meaningless.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [fix][broker] Fix UnsupportedOperationException while setting subscription level dispatch rate policy [pulsar]
Posted by "lhotari (via GitHub)" <gi...@apache.org>.
lhotari merged PR #24048:
URL: https://github.com/apache/pulsar/pull/24048
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] [fix] Fix UnsupportedOperationException when update topic policies [pulsar]
Posted by "lhotari (via GitHub)" <gi...@apache.org>.
lhotari commented on code in PR #24048:
URL: https://github.com/apache/pulsar/pull/24048#discussion_r1993159898
##########
pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicPolicies.java:
##########
@@ -192,7 +192,11 @@ public Set<String> getReplicationClustersSet() {
return replicationClusters != null ? Sets.newTreeSet(this.replicationClusters) : null;
}
+ @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
public Map<String, SubscriptionPolicies> getSubscriptionPolicies() {
- return subscriptionPolicies == null ? Collections.emptyMap() : subscriptionPolicies;
+ if (subscriptionPolicies == null) {
+ subscriptionPolicies = new HashMap<>();
Review Comment:
`ConcurrentHashMap` should be used instead of `HashMap`. There's an unresolved thread safety issue with `TopicPolicies`, #21303. Using a `ConcurrentHashMap` here would be preferred although it doesn't solve #21303.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org