kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From guozh...@apache.org
Subject kafka git commit: KAFKA-4603: Fixed the argument of shell in doc
Date Thu, 12 Jan 2017 19:25:20 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 3c6051165 -> 7ff407eaa


KAFKA-4603: Fixed the argument of shell in doc

    KAFKA-4603 the argument of shell in doc wrong and command parsed error
    In "7.6.2 Migrating clusters" of document security.html, the argument "--zookeeper.connection"
of shell "zookeeper-security-migrat.sh"   is wrong  and the using of OptionParser is not correct
    This patch corrected the doc and changed the OptionParser constructor

Author: auroraxlh <xin.lihua1@zte.com.cn>

Reviewers: Xi Hu <huxi_2b@hotmail.com>, Guozhang Wang <wangguoz@gmail.com>

Closes #2322 from auroraxlh/my-issue


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/7ff407ea
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/7ff407ea
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/7ff407ea

Branch: refs/heads/trunk
Commit: 7ff407eaa2761d8f86f39cf99e703634761e038c
Parents: 3c60511
Author: Lihua Xin <xin.lihua1@zte.com.cn>
Authored: Thu Jan 12 11:25:17 2017 -0800
Committer: Guozhang Wang <wangguoz@gmail.com>
Committed: Thu Jan 12 11:25:17 2017 -0800

----------------------------------------------------------------------
 core/src/main/scala/kafka/admin/ZkSecurityMigrator.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/7ff407ea/core/src/main/scala/kafka/admin/ZkSecurityMigrator.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/admin/ZkSecurityMigrator.scala b/core/src/main/scala/kafka/admin/ZkSecurityMigrator.scala
index 9ffee86..9bd321c 100644
--- a/core/src/main/scala/kafka/admin/ZkSecurityMigrator.scala
+++ b/core/src/main/scala/kafka/admin/ZkSecurityMigrator.scala
@@ -46,9 +46,9 @@ import scala.concurrent.duration._
  * 2- Perform a second rolling upgrade keeping the system property for the login file
  * and now setting zookeeper.set.acl to true
  * 3- Finally run this tool. There is a script under ./bin. Run 
- *   ./bin/zookeeper-security-migration --help
+ *   ./bin/zookeeper-security-migration.sh --help
  * to see the configuration parameters. An example of running it is the following:
- *  ./bin/zookeeper-security-migration --zookeeper.acl=secure --zookeeper.connection=localhost:2181
+ *  ./bin/zookeeper-security-migration.sh --zookeeper.acl=secure --zookeeper.connect=localhost:2181
  * 
  * To convert a cluster from secure to unsecure, we need to perform the following
  * steps:
@@ -65,7 +65,7 @@ object ZkSecurityMigrator extends Logging {
 
   def run(args: Array[String]) {
     var jaasFile = System.getProperty(JaasUtils.JAVA_LOGIN_CONFIG_PARAM)
-    val parser = new OptionParser()
+    val parser = new OptionParser
     val zkAclOpt = parser.accepts("zookeeper.acl", "Indicates whether to make the Kafka znodes
in ZooKeeper secure or unsecure."
         + " The options are 'secure' and 'unsecure'").withRequiredArg().ofType(classOf[String])
     val zkUrlOpt = parser.accepts("zookeeper.connect", "Sets the ZooKeeper connect string
(ensemble). This parameter " +


Mime
View raw message