You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by si...@apache.org on 2019/02/16 09:09:12 UTC
[pulsar] branch master updated: Adding configuration to disable
auto-topic creation (#3450)
This is an automated email from the ASF dual-hosted git repository.
sijie 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 924f495 Adding configuration to disable auto-topic creation (#3450)
924f495 is described below
commit 924f49513cc6990d02495d5cdb976dd55e784c82
Author: Richard Yu <yo...@gmail.com>
AuthorDate: Sat Feb 16 01:09:07 2019 -0800
Adding configuration to disable auto-topic creation (#3450)
Master Issue: #3436
---
.../org/apache/pulsar/broker/ServiceConfiguration.java | 6 +++++-
.../main/java/org/apache/pulsar/broker/PulsarService.java | 1 +
.../pulsar/broker/admin/impl/PersistentTopicsBase.java | 12 ++++++++++--
.../org/apache/pulsar/broker/service/BrokerService.java | 9 +++++----
.../apache/pulsar/broker/admin/PersistentTopicsTest.java | 14 +++++++++++++-
5 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index 5d60f72..8e00131 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -700,7 +700,11 @@ public class ServiceConfiguration implements PulsarConfiguration {
doc = "Rate limit the amount of writes per second generated by consumer acking the messages"
)
private double managedLedgerDefaultMarkDeleteRateLimit = 1.0;
-
+ @FieldContext(
+ category = CATEGORY_STORAGE_ML,
+ doc = "Allow automated creation of non-partition topics if set to true (default value)."
+ )
+ private boolean allowAutoTopicCreation = true;
@FieldContext(
category = CATEGORY_STORAGE_ML,
doc = "Number of threads to be used for managed ledger tasks dispatching"
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
index 417ec21..0dccc8d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
@@ -49,6 +49,7 @@ import org.apache.bookkeeper.common.util.OrderedScheduler;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.mledger.LedgerOffloader;
import org.apache.bookkeeper.mledger.LedgerOffloaderFactory;
+import org.apache.bookkeeper.mledger.ManagedLedgerConfig;
import org.apache.bookkeeper.mledger.ManagedLedgerFactory;
import org.apache.bookkeeper.mledger.impl.NullLedgerOffloader;
import org.apache.bookkeeper.mledger.offload.OffloaderUtils;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index e6df76d..be5badb 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -35,6 +35,7 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.CompletableFuture;
@@ -67,6 +68,7 @@ import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.admin.AdminResource;
import org.apache.pulsar.broker.admin.ZkAdminPaths;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
+import org.apache.pulsar.broker.service.BrokerService;
import org.apache.pulsar.broker.service.BrokerServiceException.AlreadyRunningException;
import org.apache.pulsar.broker.service.BrokerServiceException.NotAllowedException;
import org.apache.pulsar.broker.service.BrokerServiceException.SubscriptionBusyException;
@@ -1296,7 +1298,13 @@ public class PersistentTopicsBase extends AdminResource {
TopicName partitionTopicName = TopicName.get(topicName.getPartitionedTopicName());
PartitionedTopicMetadata partitionedTopicMetadata = getPartitionedTopicMetadata(partitionTopicName, false);
if (partitionedTopicMetadata == null || partitionedTopicMetadata.partitions == 0) {
- return new RestException(Status.NOT_FOUND, "Partitioned Topic not found");
+ final String errSrc;
+ if (partitionedTopicMetadata != null) {
+ errSrc = " has zero partitions";
+ } else {
+ errSrc = " has no metadata";
+ }
+ return new RestException(Status.NOT_FOUND, "Partitioned Topic not found: " + topicName.toString() + errSrc);
} else if (!internalGetList().contains(topicName.toString())) {
return new RestException(Status.NOT_FOUND, "Topic partitions were not yet created");
}
@@ -1306,7 +1314,7 @@ public class PersistentTopicsBase extends AdminResource {
}
private Topic getOrCreateTopic(TopicName topicName) {
- return pulsar().getBrokerService().getOrCreateTopic(topicName.toString()).join();
+ return pulsar().getBrokerService().getTopic(topicName.toString(), true).thenApply(Optional::get).join();
}
/**
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 99a8930..d26be64 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
@@ -462,11 +462,11 @@ public class BrokerService implements Closeable, ZooKeeperCacheListener<Policies
return getTopic(topic, false /* createIfMissing */);
}
- public CompletableFuture<Topic> getOrCreateTopic(final String topic) {
- return getTopic(topic, true /* createIfMissing */).thenApply(Optional::get);
+ public CompletableFuture<Topic> getOrCreateTopic(final String topic) {
+ return getTopic(topic, pulsar.getConfiguration().isAllowAutoTopicCreation()).thenApply(Optional::get);
}
- private CompletableFuture<Optional<Topic>> getTopic(final String topic, boolean createIfMissing) {
+ public CompletableFuture<Optional<Topic>> getTopic(final String topic, boolean createIfMissing) {
try {
CompletableFuture<Optional<Topic>> topicFuture = topics.get(topic);
if (topicFuture != null) {
@@ -618,7 +618,8 @@ public class BrokerService implements Closeable, ZooKeeperCacheListener<Policies
return topicFuture;
}
- private void createPersistentTopic(final String topic, boolean createIfMissing, CompletableFuture<Optional<Topic>> topicFuture) {
+ private void createPersistentTopic(final String topic, boolean createIfMissing,
+ CompletableFuture<Optional<Topic>> topicFuture) {
final long topicCreateTimeMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
TopicName topicName = TopicName.get(topic);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
index 6dfc5b0..2d23f50 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
@@ -23,6 +23,7 @@ import org.apache.pulsar.broker.admin.v2.PersistentTopics;
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
import org.apache.pulsar.broker.authentication.AuthenticationDataHttps;
import org.apache.pulsar.broker.web.PulsarWebResource;
+import org.apache.pulsar.broker.web.RestException;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.impl.MessageIdImpl;
import org.apache.pulsar.common.policies.data.ClusterData;
@@ -98,7 +99,7 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
try {
persistentTopics.getSubscriptions(testTenant, testNamespace, testLocalTopicName + "-partition-0", true);
} catch (Exception e) {
- Assert.assertEquals("Partitioned Topic not found", e.getMessage());
+ Assert.assertEquals("Partitioned Topic not found: persistent://my-tenant/my-namespace/topic-not-found-partition-0 has zero partitions", e.getMessage());
}
persistentTopics.createPartitionedTopic(testTenant, testNamespace, testLocalTopicName, 3, true);
try {
@@ -115,4 +116,15 @@ public class PersistentTopicsTest extends MockedPulsarServiceBaseTest {
persistentTopics.deletePartitionedTopic(testTenant, testNamespace, testLocalTopicName, true, true);
}
+ @Test
+ public void testGetSubscriptionsWithAutoTopicCreationDisabled() {
+ pulsar.getConfiguration().setAllowAutoTopicCreation(false);
+ final String nonPartitionTopic = "non-partitioned-topic";
+ persistentTopics.createSubscription(testTenant, testNamespace, nonPartitionTopic, "test", true, (MessageIdImpl) MessageId.latest);
+ try {
+ persistentTopics.getSubscriptions(testTenant, testNamespace, nonPartitionTopic + "-partition-0", true);
+ } catch (RestException exc) {
+ Assert.assertTrue(exc.getMessage().contains("zero partitions"));
+ }
+ }
}