Repository: hadoop Updated Branches: refs/heads/trunk e27d5a13b -> 9cd5ad9d8
HDFS-8551. Fix hdfs datanode CLI usage message. 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/9cd5ad9d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9cd5ad9d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9cd5ad9d Branch: refs/heads/trunk Commit: 9cd5ad9d84e46295249877ade50cd49c34b9bf12 Parents: e27d5a1 Author: Xiaoyu Yao <[email protected]> Authored: Tue Jun 16 14:12:45 2015 -0700 Committer: Xiaoyu Yao <[email protected]> Committed: Tue Jun 16 14:12:45 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cd5ad9d/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 c8c36e6..2d4c062 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -903,6 +903,9 @@ Release 2.8.0 - UNRELEASED HDFS-8548. Minicluster throws NPE on shutdown. (surendra singh lilhore via xyao) + HDFS-8551. Fix hdfs datanode CLI usage message. + (Brahma Reddy Battula via xyao) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cd5ad9d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java index 3bd131e..74acf81 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -262,9 +262,11 @@ public class DataNode extends ReconfigurableBase LogFactory.getLog(DataNode.class.getName() + ".clienttrace"); private static final String USAGE = - "Usage: java DataNode [-regular | -rollback]\n" + + "Usage: hdfs datanode [-regular | -rollback | -rollingupgrade rollback" + + " ]\n" + " -regular : Normal DataNode startup (default).\n" + " -rollback : Rollback a standard or rolling upgrade.\n" + + " -rollingupgrade rollback : Rollback a rolling upgrade operation.\n" + " Refer to HDFS documentation for the difference between standard\n" + " and rolling upgrades.";
