Repository: hadoop Updated Branches: refs/heads/branch-2 a9adc1295 -> 8f9822541
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/8f982254 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8f982254 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8f982254 Branch: refs/heads/branch-2 Commit: 8f982254189b4e39f12da3de97585c15d4faabf2 Parents: a9adc12 Author: Colin Patrick Mccabe <[email protected]> Authored: Wed Nov 26 13:42:07 2014 -0800 Committer: Colin Patrick Mccabe <[email protected]> Committed: Wed Nov 26 13:42:07 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 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 +++ 4 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f982254/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 a7bd409..3facb02 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -110,6 +110,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11300. KMS startup scripts must not display the keystore / truststore passwords. (Arun Suresh via wang) + HADOOP-11257. Update "hadoop jar" documentation to warn against using it + for launching yarn jars (iwasakims via cmccabe) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f982254/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 fa0d981..c5b096f 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop @@ -31,6 +31,8 @@ function print_usage(){ 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" @@ -101,6 +103,9 @@ case $COMMAND in CLASS=org.apache.hadoop.util.VersionInfo elif [ "$COMMAND" = "jar" ] ; then CLASS=org.apache.hadoop.util.RunJar + if [[ -n "${YARN_OPTS}" ]] || [[ -n "${YARN_CLIENT_OPTS}" ]]; then + echo "WARNING: Use \"yarn jar\" to launch YARN applications." + fi elif [ "$COMMAND" = "key" ] ; then CLASS=org.apache.hadoop.crypto.key.KeyShell elif [ "$COMMAND" = "checknative" ] ; then http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f982254/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 da68a7c..aebac81 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd @@ -161,6 +161,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 @@ -241,6 +246,8 @@ call :updatepath %HADOOP_BIN_PATH% goto :MakeCmdArgsLoop :EndLoop set hadoop-command-arguments=%_arguments% + @echo note: please use "yarn jar" to launch + @echo YARN applications, not this command. goto :eof :print_usage http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f982254/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
