Repository: hadoop Updated Branches: refs/heads/branch-2 5a002aef1 -> 116a72096
HDFS-8552. Fix hdfs CLI usage message for namenode and zkfc. Contributed by Brahma Reddy Battula (cherry picked from commit 927577c87ca19e8b5b75722f78e2def6d9386576) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/116a7209 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/116a7209 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/116a7209 Branch: refs/heads/branch-2 Commit: 116a72096d7cda577d774c228a1e9e594a6b9b23 Parents: 5a002ae Author: Xiaoyu Yao <x...@apache.org> Authored: Mon Jun 8 21:57:26 2015 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Mon Jun 8 22:03:07 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/ha/ZKFailoverController.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/namenode/NameNode.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/116a7209/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java ---------------------------------------------------------------------- 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 788d48e..b1f5920 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,7 +84,7 @@ public abstract class ZKFailoverController { }; protected static final String USAGE = - "Usage: java zkfc [ -formatZK [-force] [-nonInteractive] ]"; + "Usage: hdfs zkfc [ -formatZK [-force] [-nonInteractive] ]"; /** Unable to format the parent znode in ZK */ static final int ERR_CODE_FORMAT_DENIED = 2; http://git-wip-us.apache.org/repos/asf/hadoop/blob/116a7209/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 0a9b7cd..6dc2d86 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -272,6 +272,9 @@ Release 2.8.0 - UNRELEASED HDFS-8553. Document hdfs class path options. (Brahma Reddy Battula via cnauroth) + HDFS-8552. Fix hdfs CLI usage message for namenode and zkfc. + (Brahma Reddy Battula via xyao) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/116a7209/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java index 29c783c..5d69fac 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java @@ -245,7 +245,7 @@ public class NameNode implements NameNodeStatusMXBean { DFS_HA_AUTO_FAILOVER_ENABLED_KEY }; - private static final String USAGE = "Usage: java NameNode [" + private static final String USAGE = "Usage: hdfs namenode [" + StartupOption.BACKUP.getName() + "] | \n\t[" + StartupOption.CHECKPOINT.getName() + "] | \n\t[" + StartupOption.FORMAT.getName() + " ["