From 72bff192cd37ff97442e0f8dd477fbc2e58fc12d Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Wed, 14 Dec 2016 18:50:43 +0900 Subject: [PATCH] HDFS-11204. Document the missing options of hdfs zkfc command. Contributed by Yiqun Lin. --- .../java/org/apache/hadoop/ha/ZKFailoverController.java | 7 +++++-- .../hadoop-hdfs/src/site/markdown/HDFSCommands.md | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java index 30ec8f2c775..0ed91582c9a 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java @@ -84,8 +84,11 @@ public abstract class ZKFailoverController { ZK_AUTH_KEY }; - protected static final String USAGE = - "Usage: hdfs zkfc [ -formatZK [-force] [-nonInteractive] ]"; + protected static final String USAGE = + "Usage: hdfs zkfc [ -formatZK [-force] [-nonInteractive] ]\n" + + "\t-force: formats the znode if the znode exists.\n" + + "\t-nonInteractive: formats the znode aborts if the znode exists,\n" + + "\tunless -force option is specified."; /** Unable to format the parent znode in ZK */ static final int ERR_CODE_FORMAT_DENIED = 2; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md index 7f7dcde5212..a0d0ed73973 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md @@ -599,7 +599,7 @@ Usage: `hdfs zkfc [-formatZK [-force] [-nonInteractive]]` | COMMAND\_OPTION | Description | |:---- |:---- | -| `-formatZK` | Format the Zookeeper instance | +| `-formatZK` | Format the Zookeeper instance. -force: formats the znode if the znode exists. -nonInteractive: formats the znode aborts if the znode exists, unless -force option is specified. | | `-h` | Display help | This comamnd starts a Zookeeper Failover Controller process for use with [HDFS HA with QJM](./HDFSHighAvailabilityWithQJM.html#Administrative_commands).