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/10c98aed Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10c98aed Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10c98aed Branch: refs/heads/HDFS-EC Commit: 10c98aed38430df5a18899b098c34f5874a798d4 Parents: f2fe8a8 Author: Colin Patrick Mccabe <cmcc...@cloudera.com> Authored: Fri Nov 14 12:53:09 2014 -0800 Committer: Colin Patrick Mccabe <cmcc...@cloudera.com> Committed: Fri Nov 14 12:53:09 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/10c98aed/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/10c98aed/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..c537539 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd @@ -177,6 +177,11 @@ call :updatepath %HADOOP_BIN_PATH% goto :eof :version + 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.VersionInfo goto :eof @@ -261,6 +266,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/10c98aed/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