From 9cd5ad9d84e46295249877ade50cd49c34b9bf12 Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Tue, 16 Jun 2015 14:12:45 -0700 Subject: [PATCH] HDFS-8551. Fix hdfs datanode CLI usage message. Contributed by Brahma Reddy Battula. --- 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(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index c8c36e6440c..2d4c062bc39 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 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 3bd131ec56f..74acf81345a 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.";