HADOOP-11257. Update "hadoop jar" documentation to warn against using it for launching yarn jars (iwasakims via cmccabe)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aa2f2772 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aa2f2772 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aa2f2772 Branch: refs/heads/HDFS-EC Commit: aa2f27725625aba532a2b19fbab8c3ead1429d32 Parents: 8f1454c Author: Colin Patrick Mccabe <cmcc...@cloudera.com> Authored: Wed Nov 26 12:17:48 2014 -0800 Committer: Colin Patrick Mccabe <cmcc...@cloudera.com> Committed: Wed Nov 26 12:17:48 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/src/main/bin/hadoop | 5 +++++ hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd | 7 +++++++ .../hadoop-common/src/site/apt/CommandsManual.apt.vm | 3 +++ 3 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa2f2772/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 eccd322..9df2c7d 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop @@ -33,6 +33,8 @@ function hadoop_usage() echo " copy file or directories recursively" echo " fs run a generic filesystem user client" echo " jar <jar> run a jar file" + echo " note: please use \"yarn jar\" to launch" + echo " YARN applications, not this command." echo " jnipath prints the java.library.path" echo " key manage keys via the KeyProvider" echo " trace view and modify Hadoop tracing settings" @@ -150,6 +152,9 @@ case ${COMMAND} in CLASS=org.apache.hadoop.fs.FsShell ;; jar) + if [[ -n "${YARN_OPTS}" ]] || [[ -n "${YARN_CLIENT_OPTS}" ]]; then + hadoop_error "WARNING: Use \"yarn jar\" to launch YARN applications." + fi CLASS=org.apache.hadoop.util.RunJar ;; jnipath) http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa2f2772/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd index fc2e9b7..f612ace 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd @@ -181,6 +181,11 @@ call :updatepath %HADOOP_BIN_PATH% goto :eof :jar + if defined YARN_OPTS ( + @echo WARNING: Use "yarn jar" to launch YARN applications. + ) else if defined YARN_CLIENT_OPTS ( + @echo WARNING: Use "yarn jar" to launch YARN applications. + ) set CLASS=org.apache.hadoop.util.RunJar goto :eof @@ -269,6 +274,8 @@ call :updatepath %HADOOP_BIN_PATH% @echo fs run a generic filesystem user client @echo version print the version @echo jar ^<jar^> run a jar file + @echo note: please use "yarn jar" to launch + @echo YARN applications, not this command. @echo checknative [-a^|-h] check native hadoop and compression libraries availability @echo distcp ^<srcurl^> ^<desturl^> copy file or directories recursively @echo archive -archiveName NAME -p ^<parent path^> ^<src^>* ^<dest^> create a hadoop archive http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa2f2772/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm index 7771aa1..6d2fd5e 100644 --- a/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm +++ b/hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm @@ -177,6 +177,9 @@ User Commands Word count example is also run using jar command. It can be referred from Wordcount example + Use {{{../../hadoop-yarn/hadoop-yarn-site/YarnCommands.html#jar}<<<yarn jar>>>}} + to launch YARN applications instead. + * <<<job>>> Deprecated. Use