You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jira@kafka.apache.org by GitBox <gi...@apache.org> on 2021/12/03 00:36:32 UTC
[GitHub] [kafka] hachikuji commented on a change in pull request #11416: KAFKA-13490: Fix createTopics and incrementalAlterConfigs for KRaft mode
hachikuji commented on a change in pull request #11416:
URL: https://github.com/apache/kafka/pull/11416#discussion_r761564392
##########
File path: metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java
##########
@@ -122,19 +126,13 @@ private void incrementalAlterConfigResource(ConfigResource configResource,
newValue = opValue;
break;
case DELETE:
- if (opValue != null) {
Review comment:
Do we have any cases where a value is provided for a DELETE operation or was this just to make existing tests work?
##########
File path: core/src/main/scala/kafka/server/ControllerConfigurationValidator.scala
##########
@@ -0,0 +1,55 @@
+/*
+ * 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 java.util
+import java.util.Properties
+
+import kafka.log.LogConfig
+import org.apache.kafka.common.config.ConfigResource
+import org.apache.kafka.common.config.ConfigResource.Type.{BROKER, TOPIC}
+import org.apache.kafka.controller.ConfigurationValidator
+import org.apache.kafka.common.errors.InvalidRequestException
+
+import scala.collection.mutable
+
+class ControllerConfigurationValidator extends ConfigurationValidator {
+ override def validate(resource: ConfigResource, config: util.Map[String, String]): Unit = {
+ resource.`type`() match {
+ case TOPIC =>
+ val properties = new Properties()
+ val nullTopicConfigs = new mutable.ArrayBuffer[String]()
+ config.entrySet().forEach(e => {
+ if (e.getValue() == null) {
+ nullTopicConfigs += e.getKey()
+ } else {
+ properties.setProperty(e.getKey(), e.getValue())
+ }
+ })
+ if (!nullTopicConfigs.isEmpty) {
+ throw new InvalidRequestException("Null value not supported for topic configs : " +
+ nullTopicConfigs.mkString(","))
+ }
+ LogConfig.validate(properties)
+ case BROKER =>
+ // TODO: add broker configuration validation
Review comment:
Do we have a JIRA for this?
##########
File path: core/src/main/scala/kafka/server/ControllerConfigurationValidator.scala
##########
@@ -0,0 +1,55 @@
+/*
+ * 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 java.util
+import java.util.Properties
+
+import kafka.log.LogConfig
+import org.apache.kafka.common.config.ConfigResource
+import org.apache.kafka.common.config.ConfigResource.Type.{BROKER, TOPIC}
+import org.apache.kafka.controller.ConfigurationValidator
+import org.apache.kafka.common.errors.InvalidRequestException
+
+import scala.collection.mutable
+
+class ControllerConfigurationValidator extends ConfigurationValidator {
+ override def validate(resource: ConfigResource, config: util.Map[String, String]): Unit = {
+ resource.`type`() match {
+ case TOPIC =>
+ val properties = new Properties()
+ val nullTopicConfigs = new mutable.ArrayBuffer[String]()
+ config.entrySet().forEach(e => {
+ if (e.getValue() == null) {
+ nullTopicConfigs += e.getKey()
+ } else {
+ properties.setProperty(e.getKey(), e.getValue())
+ }
+ })
+ if (!nullTopicConfigs.isEmpty) {
+ throw new InvalidRequestException("Null value not supported for topic configs : " +
+ nullTopicConfigs.mkString(","))
+ }
+ LogConfig.validate(properties)
+ case BROKER =>
+ // TODO: add broker configuration validation
+ case _ =>
Review comment:
Another type that we need to support is `BROKER_LOGGER`. Probably worth a separate JIRA.
##########
File path: metadata/src/test/java/org/apache/kafka/controller/ConfigurationControlManagerTest.java
##########
@@ -72,6 +73,7 @@
define("ghi", ConfigDef.Type.BOOLEAN, true, ConfigDef.Importance.HIGH, "ghi"));
}
+ private final static ConfigurationValidator NOOP_VALIDATOR = (__, ___) -> { };
Review comment:
nit: maybe consider moving this so that we can use `ConfigurationValidator.NOOP` or something like that. Then it could also be used in the quorum controller builder then.
##########
File path: metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java
##########
@@ -472,11 +478,7 @@ private ApiError createTopic(CreatableTopic topic,
if (error.isFailure()) return error;
} else if (topic.replicationFactor() < -1 || topic.replicationFactor() == 0) {
return new ApiError(Errors.INVALID_REPLICATION_FACTOR,
- "Replication factor was set to an invalid non-positive value.");
- } else if (!topic.assignments().isEmpty()) {
- return new ApiError(INVALID_REQUEST,
- "Replication factor was not set to -1 but a manual partition " +
- "assignment was specified.");
+ "Replication factor must be larger than 0.");
Review comment:
Must be larger than 0 or -1 to indicate the default replication factor?
##########
File path: core/src/main/scala/kafka/server/ControllerConfigurationValidator.scala
##########
@@ -0,0 +1,55 @@
+/*
+ * 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 java.util
+import java.util.Properties
+
+import kafka.log.LogConfig
+import org.apache.kafka.common.config.ConfigResource
+import org.apache.kafka.common.config.ConfigResource.Type.{BROKER, TOPIC}
+import org.apache.kafka.controller.ConfigurationValidator
+import org.apache.kafka.common.errors.InvalidRequestException
+
+import scala.collection.mutable
+
+class ControllerConfigurationValidator extends ConfigurationValidator {
+ override def validate(resource: ConfigResource, config: util.Map[String, String]): Unit = {
+ resource.`type`() match {
+ case TOPIC =>
+ val properties = new Properties()
+ val nullTopicConfigs = new mutable.ArrayBuffer[String]()
+ config.entrySet().forEach(e => {
+ if (e.getValue() == null) {
+ nullTopicConfigs += e.getKey()
+ } else {
+ properties.setProperty(e.getKey(), e.getValue())
+ }
+ })
+ if (!nullTopicConfigs.isEmpty) {
Review comment:
nit: use `nonEmpty`
--
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-unsubscribe@kafka.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org