[
https://issues.apache.org/jira/browse/KAFKA-7147?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16576871#comment-16576871
]
ASF GitHub Bot commented on KAFKA-7147:
---------------------------------------
lindong28 closed pull request #5355: KAFKA-7147; ReassignPartitionsCommand
should be able to connect to broker over SSL
URL: https://github.com/apache/kafka/pull/5355
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core/src/main/scala/kafka/admin/LogDirsCommand.scala
b/core/src/main/scala/kafka/admin/LogDirsCommand.scala
index 9257942d1c0..b51f25d6481 100644
--- a/core/src/main/scala/kafka/admin/LogDirsCommand.scala
+++ b/core/src/main/scala/kafka/admin/LogDirsCommand.scala
@@ -27,6 +27,7 @@ import scala.collection.JavaConverters._
import scala.collection.Map
import kafka.utils.{CommandLineUtils, Json}
import joptsimple._
+import org.apache.kafka.common.utils.Utils
/**
* A command for querying log directory usage on the specified brokers
@@ -83,9 +84,12 @@ object LogDirsCommand {
}
private def createAdminClient(opts: LogDirsCommandOptions): JAdminClient =
{
- val props = new Properties()
+ val props = if (opts.options.has(opts.commandConfigOpt))
+ Utils.loadProps(opts.options.valueOf(opts.commandConfigOpt))
+ else
+ new Properties()
props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
opts.options.valueOf(opts.bootstrapServerOpt))
- props.put(AdminClientConfig.CLIENT_ID_CONFIG, "log-dirs-tool")
+ props.putIfAbsent(AdminClientConfig.CLIENT_ID_CONFIG, "log-dirs-tool")
JAdminClient.create(props)
}
@@ -95,6 +99,10 @@ object LogDirsCommand {
.withRequiredArg
.describedAs("The server(s) to use for bootstrapping")
.ofType(classOf[String])
+ val commandConfigOpt = parser.accepts("command-config", "Property file
containing configs to be passed to Admin Client.")
+ .withRequiredArg
+ .describedAs("Admin client property file")
+ .ofType(classOf[String])
val describeOpt = parser.accepts("describe", "Describe the specified
log directories on the specified brokers.")
val topicListOpt = parser.accepts("topic-list", "The list of topics to
be queried in the form \"topic1,topic2,topic3\". " +
"All topics will be queried if no topic list is specified")
diff --git a/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala
b/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala
index 4d9da90bc69..dab34a69267 100755
--- a/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala
+++ b/core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala
@@ -72,9 +72,12 @@ object ReassignPartitionsCommand extends Logging {
private def createAdminClient(opts: ReassignPartitionsCommandOptions):
Option[JAdminClient] = {
if (opts.options.has(opts.bootstrapServerOpt)) {
- val props = new Properties()
+ val props = if (opts.options.has(opts.commandConfigOpt))
+ Utils.loadProps(opts.options.valueOf(opts.commandConfigOpt))
+ else
+ new Properties()
props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
opts.options.valueOf(opts.bootstrapServerOpt))
- props.put(AdminClientConfig.CLIENT_ID_CONFIG, "reassign-partitions-tool")
+ props.putIfAbsent(AdminClientConfig.CLIENT_ID_CONFIG,
"reassign-partitions-tool")
Some(JAdminClient.create(props))
} else {
None
@@ -456,6 +459,10 @@ object ReassignPartitionsCommand extends Logging {
.withRequiredArg
.describedAs("Server(s) to use for bootstrapping")
.ofType(classOf[String])
+ val commandConfigOpt = parser.accepts("command-config", "Property file
containing configs to be passed to Admin Client.")
+ .withRequiredArg
+ .describedAs("Admin client property file")
+ .ofType(classOf[String])
val zkConnectOpt = parser.accepts("zookeeper", "REQUIRED: The connection
string for the zookeeper connection in the " +
"form host:port. Multiple URLS can be given to allow
fail-over.")
.withRequiredArg
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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
> Allow kafka-reassign-partitions.sh and kafka-log-dirs.sh to take admin client
> property file
> -------------------------------------------------------------------------------------------
>
> Key: KAFKA-7147
> URL: https://issues.apache.org/jira/browse/KAFKA-7147
> Project: Kafka
> Issue Type: Improvement
> Reporter: Dong Lin
> Assignee: Dong Lin
> Priority: Major
> Fix For: 2.1.0
>
>
> Currently both ReassignPartitionsCommand and LogDirsCommand instantiates
> AdminClient using bootstrap.servers and client.id provided by the user. Since
> it does not provide other ssl-related properties, these tools will not be
> able to talk to broker over SSL.
> In order to solve this problem, these tools should allow users to provide
> property file containing configs to be passed to AdminClient.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
