frankvicky commented on code in PR #20350:
URL: https://github.com/apache/kafka/pull/20350#discussion_r2281493256
##########
core/src/main/scala/kafka/server/KafkaApis.scala:
##########
@@ -938,10 +942,12 @@ class KafkaApis(val requestChannel: RequestChannel,
Topic.isInternal(topic),
util.Collections.emptyList()
)
- }
+ }).collect(Collectors.toList())
Review Comment:
ditto
##########
core/src/main/java/kafka/server/DefaultAutoTopicCreationManager.java:
##########
@@ -0,0 +1,274 @@
+/*
+ * 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 kafka.server;
+
+import kafka.coordinator.transaction.TransactionCoordinator;
+
+import org.apache.kafka.clients.ClientResponse;
+import org.apache.kafka.common.errors.InvalidTopicException;
+import org.apache.kafka.common.internals.Topic;
+import org.apache.kafka.common.message.CreateTopicsRequestData;
+import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopic;
+import
org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopicConfig;
+import
org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopicConfigCollection;
+import
org.apache.kafka.common.message.MetadataResponseData.MetadataResponseTopic;
+import org.apache.kafka.common.protocol.ApiKeys;
+import org.apache.kafka.common.protocol.Errors;
+import org.apache.kafka.common.requests.AbstractRequest;
+import org.apache.kafka.common.requests.CreateTopicsRequest;
+import org.apache.kafka.common.requests.CreateTopicsResponse;
+import org.apache.kafka.common.requests.RequestContext;
+import org.apache.kafka.common.requests.RequestHeader;
+import org.apache.kafka.coordinator.group.GroupCoordinator;
+import org.apache.kafka.coordinator.share.ShareCoordinator;
+import org.apache.kafka.coordinator.transaction.TransactionLogConfig;
+import org.apache.kafka.server.common.ControllerRequestCompletionHandler;
+import org.apache.kafka.server.common.NodeToControllerChannelManager;
+import org.apache.kafka.server.quota.ControllerMutationQuota;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class DefaultAutoTopicCreationManager implements
AutoTopicCreationManager {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultAutoTopicCreationManager.class);
+
+ private final KafkaConfig config;
+ private final NodeToControllerChannelManager channelManager;
+ private final GroupCoordinator groupCoordinator;
+ private final TransactionCoordinator txnCoordinator;
+ private final ShareCoordinator shareCoordinator;
+ private final Set<String> inflightTopics = ConcurrentHashMap.newKeySet();
+
+ public DefaultAutoTopicCreationManager(
+ KafkaConfig config,
+ NodeToControllerChannelManager channelManager,
+ GroupCoordinator groupCoordinator,
+ TransactionCoordinator txnCoordinator,
+ ShareCoordinator shareCoordinator
+ ) {
+ this.config = config;
+ this.channelManager = channelManager;
+ this.groupCoordinator = groupCoordinator;
+ this.txnCoordinator = txnCoordinator;
+ this.shareCoordinator = shareCoordinator;
+ }
+
+ /**
+ * Initiate auto topic creation for the given topics.
+ *
+ * @param topics the topics to create
+ * @param controllerMutationQuota the controller mutation quota for topic
creation
+ * @param metadataRequestContext defined when creating topics on behalf of
the client. The goal here is to preserve
+ * original client principal for auditing,
thus needing to wrap a plain CreateTopicsRequest
+ * inside Envelope to send to the controller
when forwarding is enabled.
+ * @return auto created topic metadata responses
+ */
+ @Override
+ public List<MetadataResponseTopic> createTopics(
+ Set<String> topics,
+ ControllerMutationQuota controllerMutationQuota,
+ Optional<RequestContext> metadataRequestContext
+ ) {
+ var creatableTopics = new HashMap<String, CreatableTopic>();
+ var uncreatableTopicResponses = new ArrayList<MetadataResponseTopic>();
+ topics.forEach(topic -> {
+ // Attempt basic topic validation before sending any requests to
the controller.
+ Optional<Errors> validationError;
+ if (!isValidTopicName(topic)) {
+ validationError = Optional.of(Errors.INVALID_TOPIC_EXCEPTION);
+ } else if (!inflightTopics.add(topic)) {
+ validationError =
Optional.of(Errors.UNKNOWN_TOPIC_OR_PARTITION);
+ } else {
+ validationError = Optional.empty();
+ }
+
+ if (validationError.isPresent()) {
+ uncreatableTopicResponses.add(new MetadataResponseTopic()
+ .setErrorCode(validationError.get().code())
+ .setName(topic)
+ .setIsInternal(Topic.isInternal(topic)));
+ } else {
+ creatableTopics.put(topic, creatableTopic(topic));
+ }
+ });
+ var creatableTopicResponses = creatableTopics.isEmpty() ?
+ List.<MetadataResponseTopic>of() :
sendCreateTopicRequest(creatableTopics, metadataRequestContext);
+ return Stream.concat(uncreatableTopicResponses.stream(),
creatableTopicResponses.stream())
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public void createStreamsInternalTopics(
+ Map<String, CreatableTopic> topics,
+ RequestContext requestContext
+ ) {
+ if (topics.isEmpty()) {
+ return;
+ }
+ topics.values().forEach(creatableTopic -> {
+ if (creatableTopic.numPartitions() == -1) {
+ creatableTopic.setNumPartitions(config.numPartitions());
+ }
+ if (creatableTopic.replicationFactor() == -1) {
+ creatableTopic.setReplicationFactor((short)
config.defaultReplicationFactor());
+ }
+ });
+ sendCreateTopicRequest(topics, Optional.of(requestContext));
+ }
+
+ private List<MetadataResponseTopic> sendCreateTopicRequest(
+ Map<String, CreatableTopic> creatableTopics,
+ Optional<RequestContext> requestContext
+ ) {
+ var topicsToCreate = new
CreateTopicsRequestData.CreatableTopicCollection(creatableTopics.values().iterator());
+ var createTopicsRequest = new CreateTopicsRequest.Builder(
+ new CreateTopicsRequestData()
+ .setTimeoutMs(config.requestTimeoutMs())
+ .setTopics(topicsToCreate)
+ );
+
+ var requestCompletionHandler = new
ControllerRequestCompletionHandler() {
+ @Override
+ public void onTimeout() {
+ clearInflightRequests(creatableTopics);
+ LOGGER.debug("Auto topic creation timed out for {}.",
creatableTopics.keySet());
+ }
+
+ @Override
+ public void onComplete(ClientResponse response) {
+ clearInflightRequests(creatableTopics);
+ if (response.authenticationException() != null) {
+ LOGGER.warn("Auto topic creation failed for {} with
authentication exception.", creatableTopics.keySet());
+ } else if (response.versionMismatch() != null) {
+ LOGGER.warn("Auto topic creation failed for {} with
invalid version exception.", creatableTopics.keySet());
+ } else {
+ if (response.hasResponse()) {
+ if (response.responseBody() instanceof
CreateTopicsResponse) {
+ var createTopicsResponse = (CreateTopicsResponse)
response.responseBody();
+
createTopicsResponse.data().topics().forEach(topicResult -> {
+ var error =
Errors.forCode(topicResult.errorCode());
+ if (error != Errors.NONE) {
+ LOGGER.warn("Auto topic creation failed
for {} with error '{}': {}.", topicResult.name(), error.name(),
topicResult.errorMessage());
+ }
+ });
+ } else {
+ LOGGER.warn("Auto topic creation request received
unexpected response type: {}.",
response.responseBody().getClass().getSimpleName());
+ }
+ }
+ LOGGER.debug("Auto topic creation completed for {} with
response {}.", creatableTopics.keySet(), response.responseBody());
+ }
+ }
+ };
+
+ var request = requestContext.<AbstractRequest.Builder<? extends
AbstractRequest>>map(context -> {
+ short requestVersion = channelManager.controllerApiVersions()
+ .map(nodeApiVersions ->
nodeApiVersions.latestUsableVersion(ApiKeys.CREATE_TOPICS))
+ // We will rely on the Metadata request to be retried in
the case
+ // that the latest version is not usable by the controller.
+ .orElseGet(ApiKeys.CREATE_TOPICS::latestVersion);
+
+ // Borrow client information such as client id and correlation id
from the original request,
+ // in order to correlate the create request with the original
metadata request.
+ var requestHeader = new RequestHeader(
+ ApiKeys.CREATE_TOPICS,
+ requestVersion,
+ context.clientId(),
+ context.correlationId()
+ );
+
+ return ForwardingManager.buildEnvelopeRequest(context,
+
createTopicsRequest.build(requestVersion).serializeWithHeader(requestHeader));
+ }).orElse(createTopicsRequest);
+
+ channelManager.sendRequest(request, requestCompletionHandler);
+
+ var creatableTopicResponses = creatableTopics.keySet().stream()
+ .map(topic -> new MetadataResponseTopic()
+ .setErrorCode(Errors.UNKNOWN_TOPIC_OR_PARTITION.code())
+ .setName(topic)
+ .setIsInternal(Topic.isInternal(topic)))
+ .collect(Collectors.toList());
Review Comment:
How about:
```suggestion
.toList();
```
##########
core/src/main/java/kafka/server/DefaultAutoTopicCreationManager.java:
##########
@@ -0,0 +1,274 @@
+/*
+ * 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 kafka.server;
+
+import kafka.coordinator.transaction.TransactionCoordinator;
+
+import org.apache.kafka.clients.ClientResponse;
+import org.apache.kafka.common.errors.InvalidTopicException;
+import org.apache.kafka.common.internals.Topic;
+import org.apache.kafka.common.message.CreateTopicsRequestData;
+import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopic;
+import
org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopicConfig;
+import
org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopicConfigCollection;
+import
org.apache.kafka.common.message.MetadataResponseData.MetadataResponseTopic;
+import org.apache.kafka.common.protocol.ApiKeys;
+import org.apache.kafka.common.protocol.Errors;
+import org.apache.kafka.common.requests.AbstractRequest;
+import org.apache.kafka.common.requests.CreateTopicsRequest;
+import org.apache.kafka.common.requests.CreateTopicsResponse;
+import org.apache.kafka.common.requests.RequestContext;
+import org.apache.kafka.common.requests.RequestHeader;
+import org.apache.kafka.coordinator.group.GroupCoordinator;
+import org.apache.kafka.coordinator.share.ShareCoordinator;
+import org.apache.kafka.coordinator.transaction.TransactionLogConfig;
+import org.apache.kafka.server.common.ControllerRequestCompletionHandler;
+import org.apache.kafka.server.common.NodeToControllerChannelManager;
+import org.apache.kafka.server.quota.ControllerMutationQuota;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class DefaultAutoTopicCreationManager implements
AutoTopicCreationManager {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultAutoTopicCreationManager.class);
+
+ private final KafkaConfig config;
+ private final NodeToControllerChannelManager channelManager;
+ private final GroupCoordinator groupCoordinator;
+ private final TransactionCoordinator txnCoordinator;
+ private final ShareCoordinator shareCoordinator;
+ private final Set<String> inflightTopics = ConcurrentHashMap.newKeySet();
+
+ public DefaultAutoTopicCreationManager(
+ KafkaConfig config,
+ NodeToControllerChannelManager channelManager,
+ GroupCoordinator groupCoordinator,
+ TransactionCoordinator txnCoordinator,
+ ShareCoordinator shareCoordinator
+ ) {
+ this.config = config;
+ this.channelManager = channelManager;
+ this.groupCoordinator = groupCoordinator;
+ this.txnCoordinator = txnCoordinator;
+ this.shareCoordinator = shareCoordinator;
+ }
+
+ /**
+ * Initiate auto topic creation for the given topics.
+ *
+ * @param topics the topics to create
+ * @param controllerMutationQuota the controller mutation quota for topic
creation
+ * @param metadataRequestContext defined when creating topics on behalf of
the client. The goal here is to preserve
+ * original client principal for auditing,
thus needing to wrap a plain CreateTopicsRequest
+ * inside Envelope to send to the controller
when forwarding is enabled.
+ * @return auto created topic metadata responses
+ */
+ @Override
+ public List<MetadataResponseTopic> createTopics(
+ Set<String> topics,
+ ControllerMutationQuota controllerMutationQuota,
+ Optional<RequestContext> metadataRequestContext
+ ) {
+ var creatableTopics = new HashMap<String, CreatableTopic>();
+ var uncreatableTopicResponses = new ArrayList<MetadataResponseTopic>();
+ topics.forEach(topic -> {
+ // Attempt basic topic validation before sending any requests to
the controller.
+ Optional<Errors> validationError;
+ if (!isValidTopicName(topic)) {
+ validationError = Optional.of(Errors.INVALID_TOPIC_EXCEPTION);
+ } else if (!inflightTopics.add(topic)) {
+ validationError =
Optional.of(Errors.UNKNOWN_TOPIC_OR_PARTITION);
+ } else {
+ validationError = Optional.empty();
+ }
+
+ if (validationError.isPresent()) {
+ uncreatableTopicResponses.add(new MetadataResponseTopic()
+ .setErrorCode(validationError.get().code())
+ .setName(topic)
+ .setIsInternal(Topic.isInternal(topic)));
+ } else {
+ creatableTopics.put(topic, creatableTopic(topic));
+ }
+ });
+ var creatableTopicResponses = creatableTopics.isEmpty() ?
+ List.<MetadataResponseTopic>of() :
sendCreateTopicRequest(creatableTopics, metadataRequestContext);
+ return Stream.concat(uncreatableTopicResponses.stream(),
creatableTopicResponses.stream())
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public void createStreamsInternalTopics(
+ Map<String, CreatableTopic> topics,
+ RequestContext requestContext
+ ) {
+ if (topics.isEmpty()) {
+ return;
+ }
+ topics.values().forEach(creatableTopic -> {
+ if (creatableTopic.numPartitions() == -1) {
+ creatableTopic.setNumPartitions(config.numPartitions());
+ }
+ if (creatableTopic.replicationFactor() == -1) {
+ creatableTopic.setReplicationFactor((short)
config.defaultReplicationFactor());
+ }
+ });
+ sendCreateTopicRequest(topics, Optional.of(requestContext));
+ }
+
+ private List<MetadataResponseTopic> sendCreateTopicRequest(
+ Map<String, CreatableTopic> creatableTopics,
+ Optional<RequestContext> requestContext
+ ) {
+ var topicsToCreate = new
CreateTopicsRequestData.CreatableTopicCollection(creatableTopics.values().iterator());
+ var createTopicsRequest = new CreateTopicsRequest.Builder(
+ new CreateTopicsRequestData()
+ .setTimeoutMs(config.requestTimeoutMs())
+ .setTopics(topicsToCreate)
+ );
+
+ var requestCompletionHandler = new
ControllerRequestCompletionHandler() {
+ @Override
+ public void onTimeout() {
+ clearInflightRequests(creatableTopics);
+ LOGGER.debug("Auto topic creation timed out for {}.",
creatableTopics.keySet());
+ }
+
+ @Override
+ public void onComplete(ClientResponse response) {
+ clearInflightRequests(creatableTopics);
+ if (response.authenticationException() != null) {
+ LOGGER.warn("Auto topic creation failed for {} with
authentication exception.", creatableTopics.keySet());
+ } else if (response.versionMismatch() != null) {
+ LOGGER.warn("Auto topic creation failed for {} with
invalid version exception.", creatableTopics.keySet());
+ } else {
+ if (response.hasResponse()) {
+ if (response.responseBody() instanceof
CreateTopicsResponse) {
+ var createTopicsResponse = (CreateTopicsResponse)
response.responseBody();
Review Comment:
We could leverage pattern matching here.
```suggestion
if (response.responseBody() instanceof
CreateTopicsResponse createTopicsResponse) {
```
--
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: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
