You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by bo...@apache.org on 2022/12/09 06:14:06 UTC
[pulsar] branch branch-2.9 updated: [fix][broker] Fix uncompleted future when get the topic policies of a deleted topic (#18824)
This is an automated email from the ASF dual-hosted git repository.
bogong pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new 867b1e6c220 [fix][broker] Fix uncompleted future when get the topic policies of a deleted topic (#18824)
867b1e6c220 is described below
commit 867b1e6c220a28c143ca5ab8ab7ee79ea07bce80
Author: Xiangying Meng <55...@users.noreply.github.com>
AuthorDate: Fri Dec 9 12:41:57 2022 +0800
[fix][broker] Fix uncompleted future when get the topic policies of a deleted topic (#18824)
Fix the uncompleted future when getting the topic policies of a deleted topic.
https://github.com/apache/pulsar/blob/30b52a1ac11b4be485258140a167b5e635586a36/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java#L513-L535
`future.complete(null);` when `msg.getValue() == null`.
(cherry picked from commit b3119613dd66038399eb4e354d6621bfe152cace)
---
.../service/SystemTopicBasedTopicPoliciesService.java | 2 ++
.../apache/pulsar/broker/admin/TopicPoliciesTest.java | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
index 38ec5d803c6..bbe4d26dd86 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
@@ -477,6 +477,8 @@ public class SystemTopicBasedTopicPoliciesService implements TopicPoliciesServic
} else {
fetchTopicPoliciesAsyncAndCloseReader(reader, topicName, policies, future);
}
+ } else {
+ future.complete(null);
}
});
} else {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
index 7af136a0f97..f82d7c01230 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesTest.java
@@ -79,6 +79,7 @@ import org.apache.pulsar.common.policies.data.PublishRate;
import org.apache.pulsar.common.policies.data.RetentionPolicies;
import org.apache.pulsar.common.policies.data.SubscribeRate;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
+import org.apache.pulsar.common.policies.data.TopicPolicies;
import org.apache.pulsar.common.policies.data.TopicStats;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
@@ -2711,4 +2712,21 @@ public class TopicPoliciesTest extends MockedPulsarServiceBaseTest {
});
}
}
+
+ @Test
+ public void testGetTopicPoliciesWhenDeleteTopicPolicy() throws Exception {
+ admin.topics().createNonPartitionedTopic(persistenceTopic);
+ admin.topicPolicies().setMaxConsumers(persistenceTopic, 5);
+
+ Integer maxConsumerPerTopic = pulsar
+ .getTopicPoliciesService()
+ .getTopicPoliciesBypassCacheAsync(TopicName.get(persistenceTopic)).get()
+ .getMaxConsumerPerTopic();
+
+ assertEquals(maxConsumerPerTopic.intValue(), 5);
+ admin.topics().delete(persistenceTopic, true);
+ TopicPolicies topicPolicies =pulsar.getTopicPoliciesService()
+ .getTopicPoliciesBypassCacheAsync(TopicName.get(persistenceTopic)).get(5, TimeUnit.SECONDS);
+ assertNull(topicPolicies);
+ }
}