Author: llu
Date: Tue Mar 26 22:34:44 2013
New Revision: 1461353
URL: http://svn.apache.org/r1461353
Log:
HADOOP-9434. Backport HADOOP-9267: hadoop -h|-{0,2}help should print usage. (Yu
Li via llu)
Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/bin/hadoop
Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1461353&r1=1461352&r2=1461353&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Tue Mar 26 22:34:44 2013
@@ -65,6 +65,9 @@ Release 1.2.0 - unreleased
IMPROVEMENTS
+ HADOOP-9434. Backport HADOOP-9267: hadoop -h|-{0,2}help should print usage.
+ (Yu Li via llu)
+
HDFS-3515. Port HDFS-1457 to branch-1. (eli)
HDFS-3479. Port HDFS-3335 to branch-1. (Colin Patrick McCabe via eli)
Modified: hadoop/common/branches/branch-1.2/bin/hadoop
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/bin/hadoop?rev=1461353&r1=1461352&r2=1461353&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/bin/hadoop (original)
+++ hadoop/common/branches/branch-1.2/bin/hadoop Tue Mar 26 22:34:44 2013
@@ -68,8 +68,8 @@ case "`uname`" in
CYGWIN*) cygwin=true;;
esac
-# if no args specified, show usage
-if [ $# = 0 ]; then
+print_usage()
+{
echo "Usage: hadoop [--config confdir] COMMAND"
echo "where COMMAND is one of:"
echo " namenode -format format the DFS filesystem"
@@ -98,6 +98,11 @@ if [ $# = 0 ]; then
echo " or"
echo " CLASSNAME run the class named CLASSNAME"
echo "Most commands print help when invoked w/o parameters."
+}
+
+# if no args specified, show usage
+if [ $# = 0 ]; then
+ print_usage
exit 1
fi
@@ -105,6 +110,15 @@ fi
COMMAND=$1
shift
+# support help commands
+case $COMMAND in
+ # usage flags
+ --help|-help|-h|help)
+ print_usage
+ exit 0
+ ;;
+esac
+
# Determine if we're starting a secure datanode, and if so, redefine
appropriate variables
if [ "$COMMAND" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n
"$HADOOP_SECURE_DN_USER" ]; then
HADOOP_PID_DIR=$HADOOP_SECURE_DN_PID_DIR
