This is an automated email from the ASF dual-hosted git repository.
mattisonchao 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 0239d417e05 Revert "[fix][broker] Reject auto create partitioned topic
when topic name contains ``-partition-`` (#14920) (#16066)
0239d417e05 is described below
commit 0239d417e054be524e1e3fda9a7937647720289e
Author: Qiang Zhao <mattisonc...@gmail.com>
AuthorDate: Thu Jun 16 10:51:41 2022 +0800
Revert "[fix][broker] Reject auto create partitioned topic when topic name
contains ``-partition-`` (#14920) (#16066)
Co-authored-by: lipenghui <peng...@apache.org>
---
.../pulsar/broker/PulsarServerException.java | 6 ----
.../apache/pulsar/broker/admin/AdminResource.java | 4 ---
.../pulsar/broker/service/BrokerService.java | 5 ---
.../service/persistent/PersistentTopicTest.java | 39 ----------------------
4 files changed, 54 deletions(-)
diff --git
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/PulsarServerException.java
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/PulsarServerException.java
index 40dd53b3baf..1fd1d077021 100644
---
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/PulsarServerException.java
+++
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/PulsarServerException.java
@@ -44,10 +44,4 @@ public class PulsarServerException extends IOException {
super(t);
}
}
- public static class InvalidTopicNameException extends
PulsarServerException {
-
- public InvalidTopicNameException(String message) {
- super(message);
- }
- }
}
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
index caf514002d1..31c87055838 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
@@ -37,7 +37,6 @@ import javax.ws.rs.core.Response.Status;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.client.BookKeeper;
import org.apache.bookkeeper.mledger.ManagedLedgerException;
-import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.web.PulsarWebResource;
@@ -482,9 +481,6 @@ public abstract class AdminResource extends
PulsarWebResource {
if (e.getCause() instanceof RestException) {
throw (RestException) e.getCause();
}
- if (e.getCause() instanceof
PulsarServerException.InvalidTopicNameException) {
- throw new RestException(Status.PRECONDITION_FAILED,
e.getCause().getMessage());
- }
throw new RestException(e);
}
}
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 7793c947b52..3c55b3280b9 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
@@ -2668,11 +2668,6 @@ public class BrokerService implements Closeable {
@SuppressWarnings("deprecation")
private CompletableFuture<PartitionedTopicMetadata>
createDefaultPartitionedTopicAsync(TopicName topicName) {
- if
(topicName.getLocalName().contains(TopicName.PARTITIONED_TOPIC_SUFFIX)) {
- return FutureUtil.failedFuture(new PulsarServerException.
- InvalidTopicNameException(
- String.format("Invalid topic name: %s , should not
contain -partition-", topicName)));
- }
final int defaultNumPartitions =
pulsar.getBrokerService().getDefaultNumPartitions(topicName);
final int maxPartitions =
pulsar().getConfig().getMaxNumPartitionsPerPartitionedTopic();
checkArgument(defaultNumPartitions > 0,
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java
index 29052a0234d..a150e039d77 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicTest.java
@@ -29,15 +29,12 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
-import static org.testng.Assert.fail;
import java.lang.reflect.Field;
-import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.google.common.collect.Sets;
-import lombok.Cleanup;
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.mledger.ManagedLedger;
import org.apache.pulsar.broker.service.BrokerTestBase;
@@ -45,8 +42,6 @@ import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.MessageRoutingMode;
import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.common.naming.NamespaceBundle;
@@ -274,38 +269,4 @@ public class PersistentTopicTest extends BrokerTestBase {
producer.close();
}
}
-
- @Test
- public void testAutoCreatePartitionedTopicThatNameIncludePartition()
throws Exception {
- final String topicName =
"persistent://prop/autoNs/failedcreate-partition-abcde";
- final String ns = "prop/autoNs";
- admin.namespaces().createNamespace(ns);
- pulsar.getConfiguration().setAllowAutoTopicCreationType("partitioned");
- try {
- @Cleanup
- Producer<byte[]> producer =
pulsarClient.newProducer().topic(topicName)
- .create();
- fail("unexpected operation");
- } catch (PulsarClientException ex) {
- assertTrue(ex.getMessage()
- .contains("Invalid topic name"));
- }
- assertEquals(admin.topics().getList(ns).size(), 0);
- URI tcpLookupUrl = new URI(pulsar.getBrokerServiceUrl());
- PulsarClient client = PulsarClient.builder()
- .serviceUrl(tcpLookupUrl.toString())
- .build();
- try {
- @Cleanup
- Producer<byte[]> producer = client.newProducer()
- .topic(topicName)
- .create();
- fail("unexpected operation");
- } catch (PulsarClientException ex) {
- assertTrue(ex.getMessage()
- .contains("Invalid topic name"));
- }
- assertEquals(admin.topics().getList(ns).size(), 0);
-
pulsar.getConfiguration().setAllowAutoTopicCreationType("non-partitioned");
- }
}
