You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2015/01/20 00:55:12 UTC
[1/2] hadoop git commit: YARN-3015. yarn classpath command should
support same options as hadoop classpath. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 a70e2c15b -> 2c4abe920
refs/heads/trunk 4a4450836 -> cb0a15d20
YARN-3015. yarn classpath command should support same options as hadoop classpath. Contributed by Varun Saxena.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cb0a15d2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cb0a15d2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cb0a15d2
Branch: refs/heads/trunk
Commit: cb0a15d20180c7ca3799e63a2d53aa8dee800abd
Parents: 4a44508
Author: cnauroth <cn...@apache.org>
Authored: Mon Jan 19 15:52:32 2015 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Mon Jan 19 15:52:32 2015 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
hadoop-yarn-project/hadoop-yarn/bin/yarn | 4 +---
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 11 +++++++----
3 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb0a15d2/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ea7a606..5670963 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -388,6 +388,9 @@ Release 2.7.0 - UNRELEASED
YARN-3070. TestRMAdminCLI#testHelp fails for transitionToActive command.
(Contributed by Junping Du)
+ YARN-3015. yarn classpath command should support same options as hadoop
+ classpath. (Contributed by Varun Saxena)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb0a15d2/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 255082f..a176288 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn
@@ -81,9 +81,7 @@ case "${COMMAND}" in
set -- "${COMMAND}" "$@"
;;
classpath)
- hadoop_finalize
- echo "${CLASSPATH}"
- exit
+ hadoop_do_classpath_subcommand "$@"
;;
daemonlog)
CLASS=org.apache.hadoop.log.LogLevel
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb0a15d2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
index b3286e2..3f68b16 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
@@ -142,13 +142,16 @@ if "%1" == "--loglevel" (
set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_LIB_JARS_DIR%\*
if %yarn-command% == classpath (
- @echo %CLASSPATH%
- goto :eof
+ if not defined yarn-command-arguments (
+ @rem No need to bother starting up a JVM for this simple case.
+ @echo %CLASSPATH%
+ exit /b
+ )
)
set yarncommands=resourcemanager nodemanager proxyserver rmadmin version jar ^
application applicationattempt container node logs daemonlog historyserver ^
- timelineserver
+ timelineserver classpath
for %%i in ( %yarncommands% ) do (
if %yarn-command% == %%i set yarncommand=true
)
@@ -169,7 +172,7 @@ if "%1" == "--loglevel" (
goto :eof
:classpath
- @echo %CLASSPATH%
+ set CLASS=org.apache.hadoop.util.Classpath
goto :eof
:rmadmin
[2/2] hadoop git commit: YARN-3015. yarn classpath command should
support same options as hadoop classpath. Contributed by Varun Saxena.
Posted by cn...@apache.org.
YARN-3015. yarn classpath command should support same options as hadoop classpath. Contributed by Varun Saxena.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2c4abe92
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2c4abe92
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2c4abe92
Branch: refs/heads/branch-2
Commit: 2c4abe9208397cc2952dced5e41ca72ce5671384
Parents: a70e2c1
Author: cnauroth <cn...@apache.org>
Authored: Mon Jan 19 15:54:41 2015 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Mon Jan 19 15:54:41 2015 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
hadoop-yarn-project/hadoop-yarn/bin/yarn | 12 ++++++++----
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 11 +++++++----
3 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c4abe92/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 82ae526..8baae0e 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -354,6 +354,9 @@ Release 2.7.0 - UNRELEASED
YARN-3070. TestRMAdminCLI#testHelp fails for transitionToActive command.
(Contributed by Junping Du)
+ YARN-3015. yarn classpath command should support same options as hadoop
+ classpath. (Contributed by Varun Saxena)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c4abe92/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 896398d..ca7ee4c 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn
@@ -208,11 +208,15 @@ unset IFS
# figure out which class to run
if [ "$COMMAND" = "classpath" ] ; then
- if $cygwin; then
- CLASSPATH=$(cygpath -p -w "$CLASSPATH" 2>/dev/null)
+ if [ "$#" -gt 0 ]; then
+ CLASS=org.apache.hadoop.util.Classpath
+ else
+ if $cygwin; then
+ CLASSPATH=$(cygpath -p -w "$CLASSPATH" 2>/dev/null)
+ fi
+ echo $CLASSPATH
+ exit 0
fi
- echo $CLASSPATH
- exit
elif [ "$COMMAND" = "rmadmin" ] ; then
CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI'
YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS"
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c4abe92/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
index b3286e2..d594957 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
@@ -142,13 +142,16 @@ if "%1" == "--loglevel" (
set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_LIB_JARS_DIR%\*
if %yarn-command% == classpath (
- @echo %CLASSPATH%
- goto :eof
+ if not defined yarn-command-arguments (
+ @rem No need to bother starting up a JVM for this simple case.
+ @echo %CLASSPATH%
+ exit /b
+ )
)
set yarncommands=resourcemanager nodemanager proxyserver rmadmin version jar ^
application applicationattempt container node logs daemonlog historyserver ^
- timelineserver
+ timelineserver classpath
for %%i in ( %yarncommands% ) do (
if %yarn-command% == %%i set yarncommand=true
)
@@ -169,7 +172,7 @@ if "%1" == "--loglevel" (
goto :eof
:classpath
- @echo %CLASSPATH%
+ set CLASS=org.apache.hadoop.util.Classpath
goto :eof
:rmadmin