You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by da...@apache.org on 2023/09/12 14:27:56 UTC
[kafka] branch trunk updated: KAFKA-15450 Don't allow ZK migration with JBOD (#14367)
This is an automated email from the ASF dual-hosted git repository.
davidarthur pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 50693198e3b KAFKA-15450 Don't allow ZK migration with JBOD (#14367)
50693198e3b is described below
commit 50693198e3b41160cab592fc48d603879e6b0cce
Author: David Arthur <mu...@gmail.com>
AuthorDate: Tue Sep 12 10:27:50 2023 -0400
KAFKA-15450 Don't allow ZK migration with JBOD (#14367)
Reviewers: Ron Dagostino <rn...@gmail.com>
---
core/src/main/scala/kafka/server/KafkaConfig.scala | 1 +
core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala
index d690ac68fde..618faeee790 100755
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -2373,6 +2373,7 @@ class KafkaConfig private(doLog: Boolean, val props: java.util.Map[_, _], dynami
s"${KafkaConfig.ControllerListenerNamesProp} must not be empty when running in ZooKeeper migration mode: ${controllerListenerNames.asJava}")
require(interBrokerProtocolVersion.isMigrationSupported, s"Cannot enable ZooKeeper migration without setting " +
s"'${KafkaConfig.InterBrokerProtocolVersionProp}' to 3.4 or higher")
+ require(logDirs.size == 1, "Cannot enable ZooKeeper migration when multiple log directories (aka JBOD) are in use.")
} else {
// controller listener names must be empty when not in KRaft mode
require(controllerListenerNames.isEmpty,
diff --git a/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala b/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
index ea7ab2e293b..c75f3127894 100755
--- a/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
+++ b/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
@@ -1744,6 +1744,18 @@ class KafkaConfigTest {
KafkaConfig.fromProps(props)
}
+ @Test
+ def testMigrationCannotBeEnabledWithJBOD(): Unit = {
+ val props = TestUtils.createBrokerConfig(1, TestUtils.MockZkConnect, port = TestUtils.MockZkPort, logDirCount = 2)
+ props.setProperty(KafkaConfig.MigrationEnabledProp, "true")
+ props.setProperty(KafkaConfig.QuorumVotersProp, "3000@localhost:9093")
+ props.setProperty(KafkaConfig.ControllerListenerNamesProp, "CONTROLLER")
+
+ assertEquals(
+ "requirement failed: Cannot enable ZooKeeper migration when multiple log directories (aka JBOD) are in use.",
+ assertThrows(classOf[IllegalArgumentException], () => KafkaConfig.fromProps(props)).getMessage)
+ }
+
@Test
def testMigrationEnabledKRaftMode(): Unit = {
val props = new Properties()