Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-3015. yarn classpath command should support same options as hadoop classpath. Contributed by Varun Saxena.

This commit is contained in:
cnauroth 2015-01-19 15:54:41 -08:00
parent a70e2c15be
commit 2c4abe9208
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -354,6 +354,9 @@ Release 2.7.0 - UNRELEASED
YARN-3070. TestRMAdminCLI#testHelp fails for transitionToActive command. YARN-3070. TestRMAdminCLI#testHelp fails for transitionToActive command.
(Contributed by Junping Du) (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 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

12
hadoop-yarn-project/hadoop-yarn/bin/yarn
View File

@ -208,11 +208,15 @@ unset IFS
# figure out which class to run # figure out which class to run
if [ "$COMMAND" = "classpath" ] ; then if [ "$COMMAND" = "classpath" ] ; then
if $cygwin; then if [ "$#" -gt 0 ]; then
CLASSPATH=$(cygpath -p -w "$CLASSPATH" 2>/dev/null) CLASS=org.apache.hadoop.util.Classpath
else
if $cygwin; then
CLASSPATH=$(cygpath -p -w "$CLASSPATH" 2>/dev/null)
fi
echo $CLASSPATH
exit 0
fi fi
echo $CLASSPATH
exit
elif [ "$COMMAND" = "rmadmin" ] ; then elif [ "$COMMAND" = "rmadmin" ] ; then
CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI' CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI'
YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS" YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS"

11
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
View File

@ -142,13 +142,16 @@ if "%1" == "--loglevel" (
set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_LIB_JARS_DIR%\* set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\%YARN_LIB_JARS_DIR%\*
if %yarn-command% == classpath ( if %yarn-command% == classpath (
@echo %CLASSPATH% if not defined yarn-command-arguments (
goto :eof @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 ^ set yarncommands=resourcemanager nodemanager proxyserver rmadmin version jar ^
application applicationattempt container node logs daemonlog historyserver ^ application applicationattempt container node logs daemonlog historyserver ^
timelineserver timelineserver classpath
for %%i in ( %yarncommands% ) do ( for %%i in ( %yarncommands% ) do (
if %yarn-command% == %%i set yarncommand=true if %yarn-command% == %%i set yarncommand=true
) )
@ -169,7 +172,7 @@ if "%1" == "--loglevel" (
goto :eof goto :eof
:classpath :classpath
@echo %CLASSPATH% set CLASS=org.apache.hadoop.util.Classpath
goto :eof goto :eof
:rmadmin :rmadmin