Skip to content

Fix partitioned system topic check bug #10529

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

Merged
codelipenghui merged 2 commits into from
May 15, 2021
Merged

Fix partitioned system topic check bug #10529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffee00b
fix partitioned system topic check bug
hangc0276 May 10, 2021
3f70d8b
update code
hangc0276 May 11, 2021
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
5 changes: 5 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/SystemTopicClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ interface Reader<T> {
}

static boolean isSystemTopic(TopicName topicName) {
if (topicName.isPartitioned()) {
return EventsTopicNames.NAMESPACE_EVENTS_LOCAL_NAME
.equals(TopicName.get(topicName.getPartitionedTopicName()).getLocalName());
}

return EventsTopicNames.NAMESPACE_EVENTS_LOCAL_NAME.equals(topicName.getLocalName());
}

Expand Down
14 changes: 14 additions & 0 deletions ...rc/test/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.common.events.ActionType;
import org.apache.pulsar.common.events.EventType;
import org.apache.pulsar.common.events.EventsTopicNames;
import org.apache.pulsar.common.events.PulsarEvent;
import org.apache.pulsar.common.events.TopicPoliciesEvent;
import org.apache.pulsar.common.naming.NamespaceName;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.policies.data.TopicPolicies;
Expand Down Expand Up @@ -108,6 +110,18 @@ public void testSendAndReceiveNamespaceEvents() throws Exception {
Assert.assertEquals(systemTopicClientForNamespace1.getReaders().size(), 0);
}

@Test(timeOut = 30000)
public void checkSystemTopic() throws PulsarAdminException {
final String systemTopic = "persistent://" + NAMESPACE1 + "/" + EventsTopicNames.NAMESPACE_EVENTS_LOCAL_NAME;
final String normalTopic = "persistent://" + NAMESPACE1 + "/normal_topic";
admin.topics().createPartitionedTopic(normalTopic, 3);
TopicName systemTopicName = TopicName.get(systemTopic);
TopicName normalTopicName = TopicName.get(normalTopic);

Assert.assertEquals(SystemTopicClient.isSystemTopic(systemTopicName), true);
Assert.assertEquals(SystemTopicClient.isSystemTopic(normalTopicName), false);
}

private void prepareData() throws PulsarAdminException {
admin.clusters().createCluster("test", new ClusterData(pulsar.getBrokerServiceUrl()));
admin.tenants().createTenant("system-topic",
Expand Down