You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2022/12/06 13:16:45 UTC
[GitHub] [pulsar] codelipenghui commented on a diff in pull request #18666: [improve][broker] Optimize the logic of internalCreatePartitionedTopic
codelipenghui commented on code in PR #18666:
URL: https://github.com/apache/pulsar/pull/18666#discussion_r1040959117
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java:
##########
@@ -576,124 +576,87 @@ protected void internalCreatePartitionedTopic(AsyncResponse asyncResponse, int n
protected void internalCreatePartitionedTopic(AsyncResponse asyncResponse, int numPartitions,
boolean createLocalTopicOnly, Map<String, String> properties) {
- Integer maxTopicsPerNamespace = null;
-
- try {
- Policies policies = getNamespacePolicies(namespaceName);
- maxTopicsPerNamespace = policies.max_topics_per_namespace;
- } catch (RestException e) {
- if (e.getResponse().getStatus() != Status.NOT_FOUND.getStatusCode()) {
- log.error("[{}] Failed to create partitioned topic {}", clientAppId(), namespaceName, e);
- resumeAsyncResponseExceptionally(asyncResponse, e);
- return;
- }
- }
-
- try {
- if (maxTopicsPerNamespace == null) {
- maxTopicsPerNamespace = pulsar().getConfig().getMaxTopicsPerNamespace();
- }
-
- // new create check
- if (maxTopicsPerNamespace > 0 && !pulsar().getBrokerService().isSystemTopic(topicName)) {
- List<String> partitionedTopics = getTopicPartitionList(TopicDomain.persistent);
- // exclude created system topic
- long topicsCount =
- partitionedTopics.stream().filter(t ->
- !pulsar().getBrokerService().isSystemTopic(TopicName.get(t))).count();
- if (topicsCount + numPartitions > maxTopicsPerNamespace) {
- log.error("[{}] Failed to create partitioned topic {}, "
- + "exceed maximum number of topics in namespace", clientAppId(), topicName);
- resumeAsyncResponseExceptionally(asyncResponse, new RestException(Status.PRECONDITION_FAILED,
- "Exceed maximum number of topics in namespace."));
- return;
- }
- }
- } catch (Exception e) {
- log.error("[{}] Failed to create partitioned topic {}", clientAppId(), namespaceName, e);
- resumeAsyncResponseExceptionally(asyncResponse, e);
- return;
- }
-
- final int maxPartitions = pulsar().getConfig().getMaxNumPartitionsPerPartitionedTopic();
- try {
- validateNamespaceOperation(topicName.getNamespaceObject(), NamespaceOperation.CREATE_TOPIC);
- } catch (Exception e) {
- log.error("[{}] Failed to create partitioned topic {}", clientAppId(), topicName, e);
- resumeAsyncResponseExceptionally(asyncResponse, e);
- return;
- }
if (numPartitions <= 0) {
asyncResponse.resume(new RestException(Status.NOT_ACCEPTABLE,
"Number of partitions should be more than 0"));
return;
}
+ int maxPartitions = pulsar().getConfig().getMaxNumPartitionsPerPartitionedTopic();
if (maxPartitions > 0 && numPartitions > maxPartitions) {
asyncResponse.resume(new RestException(Status.NOT_ACCEPTABLE,
"Number of partitions should be less than or equal to " + maxPartitions));
return;
}
- CompletableFuture<Void> createLocalFuture = new CompletableFuture<>();
- checkTopicExistsAsync(topicName).thenAccept(exists -> {
- if (exists) {
- log.warn("[{}] Failed to create already existing topic {}", clientAppId(), topicName);
- asyncResponse.resume(new RestException(Status.CONFLICT, "This topic already exists"));
- return;
- }
-
- provisionPartitionedTopicPath(numPartitions, createLocalTopicOnly, properties)
- .thenCompose(ignored -> tryCreatePartitionsAsync(numPartitions))
- .whenComplete((ignored, ex) -> {
- if (ex != null) {
- createLocalFuture.completeExceptionally(ex);
- return;
+ checkTopicExistsAsync(topicName)
+ .thenAccept(exists -> {
+ if (exists) {
+ log.warn("[{}] Failed to create already existing topic {}", clientAppId(), topicName);
+ throw new RestException(Status.CONFLICT, "This topic already exists");
+ }
+ })
+ .thenCompose(__ -> validateNamespaceOperationAsync(topicName.getNamespaceObject(),
+ NamespaceOperation.CREATE_TOPIC))
+ .thenRun(() -> {
Review Comment:
+1
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java:
##########
@@ -576,124 +576,87 @@ protected void internalCreatePartitionedTopic(AsyncResponse asyncResponse, int n
protected void internalCreatePartitionedTopic(AsyncResponse asyncResponse, int numPartitions,
boolean createLocalTopicOnly, Map<String, String> properties) {
- Integer maxTopicsPerNamespace = null;
-
- try {
- Policies policies = getNamespacePolicies(namespaceName);
- maxTopicsPerNamespace = policies.max_topics_per_namespace;
- } catch (RestException e) {
- if (e.getResponse().getStatus() != Status.NOT_FOUND.getStatusCode()) {
- log.error("[{}] Failed to create partitioned topic {}", clientAppId(), namespaceName, e);
- resumeAsyncResponseExceptionally(asyncResponse, e);
- return;
- }
- }
-
- try {
- if (maxTopicsPerNamespace == null) {
- maxTopicsPerNamespace = pulsar().getConfig().getMaxTopicsPerNamespace();
- }
-
- // new create check
- if (maxTopicsPerNamespace > 0 && !pulsar().getBrokerService().isSystemTopic(topicName)) {
- List<String> partitionedTopics = getTopicPartitionList(TopicDomain.persistent);
- // exclude created system topic
- long topicsCount =
- partitionedTopics.stream().filter(t ->
- !pulsar().getBrokerService().isSystemTopic(TopicName.get(t))).count();
- if (topicsCount + numPartitions > maxTopicsPerNamespace) {
- log.error("[{}] Failed to create partitioned topic {}, "
- + "exceed maximum number of topics in namespace", clientAppId(), topicName);
- resumeAsyncResponseExceptionally(asyncResponse, new RestException(Status.PRECONDITION_FAILED,
- "Exceed maximum number of topics in namespace."));
- return;
- }
- }
- } catch (Exception e) {
- log.error("[{}] Failed to create partitioned topic {}", clientAppId(), namespaceName, e);
- resumeAsyncResponseExceptionally(asyncResponse, e);
- return;
- }
-
- final int maxPartitions = pulsar().getConfig().getMaxNumPartitionsPerPartitionedTopic();
- try {
- validateNamespaceOperation(topicName.getNamespaceObject(), NamespaceOperation.CREATE_TOPIC);
- } catch (Exception e) {
- log.error("[{}] Failed to create partitioned topic {}", clientAppId(), topicName, e);
- resumeAsyncResponseExceptionally(asyncResponse, e);
- return;
- }
if (numPartitions <= 0) {
asyncResponse.resume(new RestException(Status.NOT_ACCEPTABLE,
"Number of partitions should be more than 0"));
return;
}
+ int maxPartitions = pulsar().getConfig().getMaxNumPartitionsPerPartitionedTopic();
if (maxPartitions > 0 && numPartitions > maxPartitions) {
asyncResponse.resume(new RestException(Status.NOT_ACCEPTABLE,
"Number of partitions should be less than or equal to " + maxPartitions));
return;
}
- CompletableFuture<Void> createLocalFuture = new CompletableFuture<>();
- checkTopicExistsAsync(topicName).thenAccept(exists -> {
- if (exists) {
- log.warn("[{}] Failed to create already existing topic {}", clientAppId(), topicName);
- asyncResponse.resume(new RestException(Status.CONFLICT, "This topic already exists"));
- return;
- }
-
- provisionPartitionedTopicPath(numPartitions, createLocalTopicOnly, properties)
- .thenCompose(ignored -> tryCreatePartitionsAsync(numPartitions))
- .whenComplete((ignored, ex) -> {
- if (ex != null) {
- createLocalFuture.completeExceptionally(ex);
- return;
+ checkTopicExistsAsync(topicName)
Review Comment:
`checkTopicExistsAsync` is a little expensive. It will list all the topics under the namespace.
We should check other conditions first.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org