Jason918 commented on a change in pull request #12874:
URL: https://github.com/apache/pulsar/pull/12874#discussion_r755682655
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
##########
@@ -1189,65 +1190,70 @@ protected void handleProducer(final CommandProducer
cmdProducer) {
service.getOrCreateTopic(topicName.toString()).thenAccept((Topic
topic) -> {
// Before creating producer, check if backlog quota exceeded
// on topic for size based limit and time based limit
- for (BacklogQuota.BacklogQuotaType backlogQuotaType :
BacklogQuota.BacklogQuotaType.values()) {
- if (topic.isBacklogQuotaExceeded(producerName,
backlogQuotaType)) {
- IllegalStateException illegalStateException = new
IllegalStateException(
- "Cannot create producer on topic with backlog
quota exceeded");
- BacklogQuota.RetentionPolicy retentionPolicy = topic
- .getBacklogQuota(backlogQuotaType).getPolicy();
- if (retentionPolicy ==
BacklogQuota.RetentionPolicy.producer_request_hold) {
- commandSender.sendErrorResponse(requestId,
-
ServerError.ProducerBlockedQuotaExceededError,
- illegalStateException.getMessage());
- } else if (retentionPolicy ==
BacklogQuota.RetentionPolicy.producer_exception) {
- commandSender.sendErrorResponse(requestId,
-
ServerError.ProducerBlockedQuotaExceededException,
- illegalStateException.getMessage());
- }
-
producerFuture.completeExceptionally(illegalStateException);
- producers.remove(producerId, producerFuture);
- return;
+ CompletableFuture<Void> backlogQuotaCheckFuture =
CompletableFuture.allOf(
+ topic.checkBacklogQuotaExceeded(producerName,
BacklogQuotaType.destination_storage),
+ topic.checkBacklogQuotaExceeded(producerName,
BacklogQuotaType.message_age));
+ backlogQuotaCheckFuture.exceptionally(throwable -> {
+ //throwable should be CompletionException holding
TopicBacklogQuotaExceededException
+ BrokerServiceException.TopicBacklogQuotaExceededException
exception =
+
(BrokerServiceException.TopicBacklogQuotaExceededException)
throwable.getCause();
+ IllegalStateException illegalStateException = new
IllegalStateException(exception);
+ BacklogQuota.RetentionPolicy retentionPolicy =
exception.getRetentionPolicy();
+ if (retentionPolicy ==
BacklogQuota.RetentionPolicy.producer_request_hold) {
+ commandSender.sendErrorResponse(requestId,
+ ServerError.ProducerBlockedQuotaExceededError,
+ illegalStateException.getMessage());
+ } else if (retentionPolicy ==
BacklogQuota.RetentionPolicy.producer_exception) {
+ commandSender.sendErrorResponse(requestId,
+
ServerError.ProducerBlockedQuotaExceededException,
+ illegalStateException.getMessage());
}
- }
- // Check whether the producer will publish encrypted messages
or not
- if ((topic.isEncryptionRequired() ||
encryptionRequireOnProducer) && !isEncrypted) {
- String msg = String.format("Encryption is required in %s",
topicName);
- log.warn("[{}] {}", remoteAddress, msg);
- commandSender.sendErrorResponse(requestId,
ServerError.MetadataError, msg);
+
producerFuture.completeExceptionally(illegalStateException);
producers.remove(producerId, producerFuture);
- return;
- }
+ return null;
+ });
- disableTcpNoDelayIfNeeded(topicName.toString(), producerName);
+ backlogQuotaCheckFuture.thenRun(() -> {
Review comment:
The trigger thread is the same as the above
`backlogQuotaCheckFuture.exceptionally`, it's current thread or ReadEntry call
back thread.
--
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-unsubscr...@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
