[GitHub] [kafka] wenbingshen commented on a change in pull request #10304: KAFKA-12454:Add ERROR logging on kafka-log-dirs when given brokerIds do not exist in current kafka cluster
wenbingshen commented on a change in pull request #10304:
URL: https://github.com/apache/kafka/pull/10304#discussion_r595061621
##
File path: core/src/main/scala/kafka/admin/LogDirsCommand.scala
##
@@ -39,19 +39,29 @@ object LogDirsCommand {
def describe(args: Array[String], out: PrintStream): Unit = {
val opts = new LogDirsCommandOptions(args)
val adminClient = createAdminClient(opts)
-val topicList =
opts.options.valueOf(opts.topicListOpt).split(",").filter(!_.isEmpty)
-val brokerList = Option(opts.options.valueOf(opts.brokerListOpt))
match {
-case Some(brokerListStr) =>
brokerListStr.split(',').filter(!_.isEmpty).map(_.toInt)
-case None =>
adminClient.describeCluster().nodes().get().asScala.map(_.id()).toArray
-}
+val topicList =
opts.options.valueOf(opts.topicListOpt).split(",").filter(_.nonEmpty)
Review comment:
Good.It has been modified in the latest submission.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [kafka] wenbingshen commented on a change in pull request #10304: KAFKA-12454:Add ERROR logging on kafka-log-dirs when given brokerIds do not exist in current kafka cluster
wenbingshen commented on a change in pull request #10304:
URL: https://github.com/apache/kafka/pull/10304#discussion_r595060904
##
File path: core/src/test/scala/unit/kafka/admin/LogDirsCommandTest.scala
##
@@ -0,0 +1,68 @@
+/**
+ * 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 unit.kafka.admin
+
+import java.io.{ByteArrayOutputStream, PrintStream}
+import java.nio.charset.StandardCharsets
+
+import kafka.admin.LogDirsCommand
+import kafka.integration.KafkaServerTestHarness
+import kafka.server.KafkaConfig
+import kafka.utils.TestUtils
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+
+import scala.collection.Seq
+
+class LogDirsCommandTest extends KafkaServerTestHarness {
+
+ def generateConfigs: Seq[KafkaConfig] = {
+TestUtils.createBrokerConfigs(1, zkConnect)
+ .map(KafkaConfig.fromProps)
+ }
+
+ @Test
+ def checkLogDirsCommandOutput(): Unit = {
+val byteArrayOutputStream = new ByteArrayOutputStream
+val printStream = new PrintStream(byteArrayOutputStream, false,
StandardCharsets.UTF_8.name())
+//input exist brokerList
+LogDirsCommand.describe(Array("--bootstrap-server", brokerList,
"--broker-list", "0", "--describe"), printStream)
+val existBrokersContent = new String(byteArrayOutputStream.toByteArray,
StandardCharsets.UTF_8)
+val existBrokersLineIter = existBrokersContent.split("\n").iterator
+
+assertTrue(existBrokersLineIter.hasNext)
+assertTrue(existBrokersLineIter.next().contains(s"Querying brokers for log
directories information"))
+
+//input nonExist brokerList
Review comment:
It has been modified.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [kafka] wenbingshen commented on a change in pull request #10304: KAFKA-12454:Add ERROR logging on kafka-log-dirs when given brokerIds do not exist in current kafka cluster
wenbingshen commented on a change in pull request #10304:
URL: https://github.com/apache/kafka/pull/10304#discussion_r595060548
##
File path: core/src/test/scala/unit/kafka/admin/LogDirsCommandTest.scala
##
@@ -0,0 +1,68 @@
+/**
+ * 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 unit.kafka.admin
+
+import java.io.{ByteArrayOutputStream, PrintStream}
+import java.nio.charset.StandardCharsets
+
+import kafka.admin.LogDirsCommand
+import kafka.integration.KafkaServerTestHarness
+import kafka.server.KafkaConfig
+import kafka.utils.TestUtils
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+
+import scala.collection.Seq
+
+class LogDirsCommandTest extends KafkaServerTestHarness {
+
+ def generateConfigs: Seq[KafkaConfig] = {
+TestUtils.createBrokerConfigs(1, zkConnect)
+ .map(KafkaConfig.fromProps)
+ }
+
+ @Test
+ def checkLogDirsCommandOutput(): Unit = {
+val byteArrayOutputStream = new ByteArrayOutputStream
+val printStream = new PrintStream(byteArrayOutputStream, false,
StandardCharsets.UTF_8.name())
+//input exist brokerList
+LogDirsCommand.describe(Array("--bootstrap-server", brokerList,
"--broker-list", "0", "--describe"), printStream)
+val existBrokersContent = new String(byteArrayOutputStream.toByteArray,
StandardCharsets.UTF_8)
+val existBrokersLineIter = existBrokersContent.split("\n").iterator
+
+assertTrue(existBrokersLineIter.hasNext)
+assertTrue(existBrokersLineIter.next().contains(s"Querying brokers for log
directories information"))
+
+//input nonExist brokerList
+byteArrayOutputStream.reset()
+LogDirsCommand.describe(Array("--bootstrap-server", brokerList,
"--broker-list", "0,1,2", "--describe"), printStream)
Review comment:
@chia7712 I have added the duplicate ids test and it passed.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [kafka] wenbingshen commented on a change in pull request #10304: KAFKA-12454:Add ERROR logging on kafka-log-dirs when given brokerIds do not exist in current kafka cluster
wenbingshen commented on a change in pull request #10304:
URL: https://github.com/apache/kafka/pull/10304#discussion_r594484169
##
File path: core/src/main/scala/kafka/admin/LogDirsCommand.scala
##
@@ -39,19 +39,29 @@ object LogDirsCommand {
def describe(args: Array[String], out: PrintStream): Unit = {
val opts = new LogDirsCommandOptions(args)
val adminClient = createAdminClient(opts)
-val topicList =
opts.options.valueOf(opts.topicListOpt).split(",").filter(!_.isEmpty)
-val brokerList = Option(opts.options.valueOf(opts.brokerListOpt))
match {
-case Some(brokerListStr) =>
brokerListStr.split(',').filter(!_.isEmpty).map(_.toInt)
-case None =>
adminClient.describeCluster().nodes().get().asScala.map(_.id()).toArray
-}
+val topicList =
opts.options.valueOf(opts.topicListOpt).split(",").filter(_.nonEmpty)
+try {
+val clusterBrokers =
adminClient.describeCluster().nodes().get().asScala.map(_.id()).toSet
+val (existingBrokers, nonExistingBrokers) =
Option(opts.options.valueOf(opts.brokerListOpt)) match {
+case Some(brokerListStr) =>
+val inputBrokers =
brokerListStr.split(',').filter(_.nonEmpty).map(_.toInt).toSet
+(inputBrokers, inputBrokers.diff(clusterBrokers))
+case None => (clusterBrokers, Set.empty)
+}
-out.println("Querying brokers for log directories information")
-val describeLogDirsResult: DescribeLogDirsResult =
adminClient.describeLogDirs(brokerList.map(Integer.valueOf).toSeq.asJava)
-val logDirInfosByBroker =
describeLogDirsResult.allDescriptions.get().asScala.map { case (k, v) => k ->
v.asScala }
+if (nonExistingBrokers.nonEmpty) {
+out.println(s"ERROR: The given node(s) does not exist from
broker-list: ${nonExistingBrokers.mkString(",")}. Current cluster exist
node(s): ${clusterBrokers.mkString(",")}")
+} else {
+out.println("Querying brokers for log directories information")
+val describeLogDirsResult: DescribeLogDirsResult =
adminClient.describeLogDirs(existingBrokers.map(Integer.valueOf).toSeq.asJava)
Review comment:
Sorry, I forgot this, I will change it right away
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [kafka] wenbingshen commented on a change in pull request #10304: KAFKA-12454:Add ERROR logging on kafka-log-dirs when given brokerIds do not exist in current kafka cluster
wenbingshen commented on a change in pull request #10304:
URL: https://github.com/apache/kafka/pull/10304#discussion_r594483345
##
File path: core/src/main/scala/kafka/admin/LogDirsCommand.scala
##
@@ -39,19 +39,29 @@ object LogDirsCommand {
def describe(args: Array[String], out: PrintStream): Unit = {
val opts = new LogDirsCommandOptions(args)
val adminClient = createAdminClient(opts)
-val topicList =
opts.options.valueOf(opts.topicListOpt).split(",").filter(!_.isEmpty)
-val brokerList = Option(opts.options.valueOf(opts.brokerListOpt))
match {
-case Some(brokerListStr) =>
brokerListStr.split(',').filter(!_.isEmpty).map(_.toInt)
-case None =>
adminClient.describeCluster().nodes().get().asScala.map(_.id()).toArray
-}
+val topicList =
opts.options.valueOf(opts.topicListOpt).split(",").filter(_.nonEmpty)
+try {
+val clusterBrokers =
adminClient.describeCluster().nodes().get().asScala.map(_.id()).toSet
+val (existingBrokers, nonExistingBrokers) =
Option(opts.options.valueOf(opts.brokerListOpt)) match {
+case Some(brokerListStr) =>
+val inputBrokers =
brokerListStr.split(',').filter(_.nonEmpty).map(_.toInt).toSet
+(inputBrokers, inputBrokers.diff(clusterBrokers))
+case None => (clusterBrokers, Set.empty)
+}
-out.println("Querying brokers for log directories information")
-val describeLogDirsResult: DescribeLogDirsResult =
adminClient.describeLogDirs(brokerList.map(Integer.valueOf).toSeq.asJava)
-val logDirInfosByBroker =
describeLogDirsResult.allDescriptions.get().asScala.map { case (k, v) => k ->
v.asScala }
+if (nonExistingBrokers.nonEmpty) {
+out.println(s"ERROR: The given node(s) does not exist from
broker-list: ${nonExistingBrokers.mkString(",")}. Current cluster exist
node(s): ${clusterBrokers.mkString(",")}")
Review comment:
Good idea.I will act right away.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [kafka] wenbingshen commented on a change in pull request #10304: KAFKA-12454:Add ERROR logging on kafka-log-dirs when given brokerIds do not exist in current kafka cluster
wenbingshen commented on a change in pull request #10304: URL: https://github.com/apache/kafka/pull/10304#discussion_r594482210 ## File path: core/src/test/scala/unit/kafka/admin/LogDirsCommandTest.scala ## @@ -0,0 +1,52 @@ +package unit.kafka.admin Review comment: Sorry, after checking the compilation report, I have realized this problem and I have made changes. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [kafka] wenbingshen commented on a change in pull request #10304: KAFKA-12454:Add ERROR logging on kafka-log-dirs when given brokerIds do not exist in current kafka cluster
wenbingshen commented on a change in pull request #10304:
URL: https://github.com/apache/kafka/pull/10304#discussion_r593706745
##
File path: core/src/main/scala/kafka/admin/LogDirsCommand.scala
##
@@ -40,9 +40,16 @@ object LogDirsCommand {
val opts = new LogDirsCommandOptions(args)
val adminClient = createAdminClient(opts)
val topicList =
opts.options.valueOf(opts.topicListOpt).split(",").filter(!_.isEmpty)
+val clusterBrokers: Array[Int] =
adminClient.describeCluster().nodes().get().asScala.map(_.id()).toArray
val brokerList = Option(opts.options.valueOf(opts.brokerListOpt))
match {
case Some(brokerListStr) =>
brokerListStr.split(',').filter(!_.isEmpty).map(_.toInt)
-case None =>
adminClient.describeCluster().nodes().get().asScala.map(_.id()).toArray
+case None => clusterBrokers
+}
+
+val nonExistBrokers: Array[Int] = brokerList.filterNot(brokerId =>
clusterBrokers.contains(brokerId))
+if (!nonExistBrokers.isEmpty) {
+ System.err.println(s"The given node(s) does not exist from
broker-list ${nonExistBrokers.mkString(",")}")
+ sys.exit(1)
Review comment:
> Should we do this only when handle the brokers provided by the user?
It does not make sense to validate the list of brokers otherwise. What do you
think?
Your suggestion is very good.I have changed the logic, please review.
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
