Repository: hadoop Updated Branches: refs/heads/branch-2 a00c9362e -> c9c1d9a5a
HADOOP-11543. Improve help message for hadoop/yarn command. 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/c9c1d9a5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c9c1d9a5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c9c1d9a5 Branch: refs/heads/branch-2 Commit: c9c1d9a5a685b710a3bcadc6ea8d2926bfecae9e Parents: a00c936 Author: Tsuyoshi Ozawa <[email protected]> Authored: Thu Feb 12 19:01:31 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Thu Feb 12 19:03:24 2015 +0900 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c9c1d9a5/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 5d474c7..e5e9f8e 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -188,6 +188,9 @@ Release 2.7.0 - UNRELEASED HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in hadoop_config.cmd. (Kiran Kumar M R via cnauroth) + HADOOP-11543. Improve help message for hadoop/yarn command. (Brahma + Reddy Battula via ozawa). + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. http://git-wip-us.apache.org/repos/asf/hadoop/blob/c9c1d9a5/hadoop-common-project/hadoop-common/src/main/bin/hadoop ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop b/hadoop-common-project/hadoop-common/src/main/bin/hadoop index bc33198..b71aa8c 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 <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." } http://git-wip-us.apache.org/repos/asf/hadoop/blob/c9c1d9a5/hadoop-yarn-project/hadoop-yarn/bin/yarn ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index ca7ee4c..061fc6e 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." }
