Skip to content

Commit

Permalink
[fix][broker] partitioned __change_events topic is policy topic (#20392)
Browse files Browse the repository at this point in the history
(cherry picked from commit 9918bce)
  • Loading branch information
michaeljmarshall committed May 25, 2023
1 parent 885792f commit 5f38eaf
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ private CompletableFuture<Consumer> internalSubscribe(final TransportCnx cnx, St
}

try {
if (!topic.endsWith(SystemTopicNames.NAMESPACE_EVENTS_LOCAL_NAME)
if (!SystemTopicNames.isTopicPoliciesSystemTopic(topic)
&& !checkSubscriptionTypesEnable(subType)) {
return FutureUtil.failedFuture(
new NotAllowedException("Topic[{" + topic + "}] doesn't support "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public static boolean isTopicPoliciesSystemTopic(String topic) {
if (topic == null) {
return false;
}
return TopicName.get(topic).getLocalName().equals(NAMESPACE_EVENTS_LOCAL_NAME);
return TopicName.getPartitionedTopicName(topic).getLocalName().equals(NAMESPACE_EVENTS_LOCAL_NAME);
}

public static boolean isTransactionInternalName(TopicName topicName) {
Expand All @@ -82,7 +82,7 @@ public static boolean isTransactionInternalName(TopicName topicName) {
}

public static boolean isSystemTopic(TopicName topicName) {
TopicName nonePartitionedTopicName = TopicName.get(topicName.getPartitionedTopicName());
return isEventSystemTopic(nonePartitionedTopicName) || isTransactionInternalName(nonePartitionedTopicName);
TopicName nonPartitionedTopicName = TopicName.get(topicName.getPartitionedTopicName());
return isEventSystemTopic(nonPartitionedTopicName) || isTransactionInternalName(nonPartitionedTopicName);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.pulsar.common.naming;

import static org.testng.AssertJUnit.assertEquals;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

@Test
public class SystemTopicNamesTest {

@DataProvider(name = "topicPoliciesSystemTopicNames")
public static Object[][] topicPoliciesSystemTopicNames() {
return new Object[][] {
{"persistent://public/default/__change_events", true},
{"persistent://public/default/__change_events-partition-0", true},
{"persistent://random-tenant/random-ns/__change_events", true},
{"persistent://random-tenant/random-ns/__change_events-partition-1", true},
{"persistent://public/default/not_really__change_events", false},
{"persistent://public/default/__change_events-diff-suffix", false},
{"persistent://a/b/not_really__change_events", false},
};
}

@Test(dataProvider = "topicPoliciesSystemTopicNames")
public void testIsTopicPoliciesSystemTopic(String topicName, boolean expectedResult) {
assertEquals(expectedResult, SystemTopicNames.isTopicPoliciesSystemTopic(topicName));
assertEquals(expectedResult, SystemTopicNames.isSystemTopic(TopicName.get(topicName)));
assertEquals(expectedResult, SystemTopicNames.isEventSystemTopic(TopicName.get(topicName)));
}
}

0 comments on commit 5f38eaf

Please sign in to comment.