From 366a12c3b9402f3c05522179c26f1972bfce8143 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Fri, 6 Feb 2015 13:34:48 +0900 Subject: [PATCH] HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-common/src/main/bin/hadoop | 8 ++++---- hadoop-yarn-project/hadoop-yarn/bin/yarn | 9 +++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 4b0faf46ff8..287e9797c02 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -178,6 +178,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11463 Replace method-local TransferManager object with S3AFileSystem#transfers. (Ted Yu via stevel) + HADOOP-11543. Improve help message for hadoop/yarn command. + (Brahma Reddy Battula via ozawa) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop b/hadoop-common-project/hadoop-common/src/main/bin/hadoop index bc33198f138..b71aa8c5a7f 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop @@ -32,8 +32,10 @@ HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR} . $HADOOP_LIBEXEC_DIR/hadoop-config.sh function print_usage(){ - echo "Usage: hadoop [--config confdir] [--loglevel loglevel] COMMAND" - echo " where COMMAND is one of:" + echo "Usage: hadoop [--config confdir] [COMMAND | CLASSNAME]" + echo " CLASSNAME run the class named CLASSNAME" + echo " or" + echo " where COMMAND is one of:" echo " fs run a generic filesystem user client" echo " version print the version" echo " jar run a jar file" @@ -47,8 +49,6 @@ function print_usage(){ echo " Hadoop jar and the required libraries" echo " daemonlog get/set the log level for each daemon" echo " trace view and modify Hadoop tracing settings" - echo " or" - echo " CLASSNAME run the class named CLASSNAME" echo "" echo "Most commands print help when invoked w/o parameters." } diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index ca7ee4c72cf..061fc6eac9d 100644 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn @@ -65,8 +65,10 @@ HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR} . $HADOOP_LIBEXEC_DIR/yarn-config.sh function print_usage(){ - echo "Usage: yarn [--config confdir] [--loglevel] COMMAND" - echo "where COMMAND is one of:" + echo "Usage: yarn [--config confdir] [COMMAND | CLASSNAME]" + echo " CLASSNAME run the class named CLASSNAME" + echo " or" + echo " where COMMAND is one of:" echo " resourcemanager -format-state-store deletes the RMStateStore" echo " resourcemanager run the ResourceManager" echo " nodemanager run a nodemanager on each slave" @@ -89,8 +91,7 @@ function print_usage(){ echo " required libraries" echo " daemonlog get/set the log level for each" echo " daemon" - echo " or" - echo " CLASSNAME run the class named CLASSNAME" + echo "" echo "Most commands print help when invoked w/o parameters." }