You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2015/06/09 07:02:29 UTC
hadoop git commit: HDFS-8552. Fix hdfs CLI usage message for namenode
and zkfc. Contributed by Brahma Reddy Battula
Repository: hadoop
Updated Branches:
refs/heads/trunk fc2ed4a1f -> 927577c87
HDFS-8552. Fix hdfs CLI usage message for namenode and zkfc. Contributed by Brahma Reddy Battula
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/927577c8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/927577c8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/927577c8
Branch: refs/heads/trunk
Commit: 927577c87ca19e8b5b75722f78e2def6d9386576
Parents: fc2ed4a
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Mon Jun 8 21:57:26 2015 -0700
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Mon Jun 8 21:57:26 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/927577c8/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/927577c8/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 01a0285..5147e38 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -612,6 +612,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/927577c8/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 268abeb..469352f 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
@@ -246,7 +246,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() + " ["