This is an automated email from the ASF dual-hosted git repository.
zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new bb41702 Avoid creating partitioned topic for partition name (#6846)
bb41702 is described below
commit bb41702501e90a0789a39a1cb921b6b82eb55d07
Author: lipenghui <[email protected]>
AuthorDate: Thu Apr 30 10:13:49 2020 +0800
Avoid creating partitioned topic for partition name (#6846)
Fixes #6840
Motivation
Avoid creating partitioned topic for partition name
Verifying this change
New unit test added.
---
.../pulsar/broker/service/BrokerService.java | 1 +
.../pulsar/broker/admin/TopicAutoCreationTest.java | 88 ++++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index 7f69792..ed10e1d 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -1882,6 +1882,7 @@ public class BrokerService implements Closeable,
ZooKeeperCacheListener<Policies
// If topic is already exist, creating
partitioned topic is not allowed.
if (metadata.partitions == 0
&& !topicExists
+ && !topicName.isPartitioned()
&&
pulsar.getBrokerService().isAllowAutoTopicCreation(topicName)
&&
pulsar.getBrokerService().isDefaultTopicTypePartitioned(topicName)) {
return
pulsar.getBrokerService().createDefaultPartitionedTopicAsync(topicName);
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
new file mode 100644
index 0000000..2067526
--- /dev/null
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
@@ -0,0 +1,88 @@
+/**
+ * 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.broker.admin;
+
+import org.apache.pulsar.client.admin.PulsarAdminException;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.ProducerConsumerBase;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.junit.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.UUID;
+
+public class TopicAutoCreationTest extends ProducerConsumerBase {
+
+ @Override
+ @BeforeMethod
+ protected void setup() throws Exception {
+ conf.setAllowAutoTopicCreationType("partitioned");
+ conf.setAllowAutoTopicCreation(true);
+ conf.setDefaultNumPartitions(3);
+ super.internalSetup();
+ super.producerBaseSetup();
+ }
+
+ @Override
+ @AfterMethod
+ protected void cleanup() throws Exception {
+ super.internalCleanup();
+ }
+
+ @Test
+ public void testPartitionedTopicAutoCreation() throws
PulsarAdminException, PulsarClientException {
+ final String namespaceName = "my-property/my-ns";
+ final String topic = "persistent://" + namespaceName +
"/test-partitioned-topi-auto-creation-"
+ + UUID.randomUUID().toString();
+
+ Producer<byte[]> producer = pulsarClient.newProducer()
+ .topic(topic)
+ .create();
+
+ List<String> partitionedTopics =
admin.topics().getPartitionedTopicList(namespaceName);
+ List<String> topics = admin.topics().getList(namespaceName);
+ Assert.assertEquals(partitionedTopics.size(), 1);
+ Assert.assertEquals(topics.size(), 3);
+
+ producer.close();
+ for (String t : topics) {
+ admin.topics().delete(t);
+ }
+
+ admin.topics().deletePartitionedTopic(topic);
+
+
+ final String partition = "persistent://" + namespaceName +
"/test-partitioned-topi-auto-creation-partition-0";
+
+ producer = pulsarClient.newProducer()
+ .topic(partition)
+ .create();
+
+ partitionedTopics =
admin.topics().getPartitionedTopicList(namespaceName);
+ topics = admin.topics().getList(namespaceName);
+ Assert.assertEquals(partitionedTopics.size(), 0);
+ Assert.assertEquals(topics.size(), 1);
+
+ producer.close();
+ }
+}
