MAPREDUCE-3283. mapred classpath CLI does not display the complete classpath. Contributed by Varun Saxena.

This commit is contained in:
cnauroth 2015-01-21 13:52:09 -08:00
parent 95858db0c1
commit 60dc848f23
3 changed files with 20 additions and 5 deletions

View File

@ -77,6 +77,9 @@ Release 2.7.0 - UNRELEASED
MAPREDUCE-6206. TestAggregatedTransferRate fails on non-US systems (Jens MAPREDUCE-6206. TestAggregatedTransferRate fails on non-US systems (Jens
Rabe via jlowe) Rabe via jlowe)
MAPREDUCE-3283. mapred classpath CLI does not display the complete classpath
(Varun Saxena via cnauroth)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -148,11 +148,15 @@ for f in $HADOOP_MAPRED_HOME/modules/*.jar; do
done done
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
fi fi
# cygwin path translation # cygwin path translation

View File

@ -94,6 +94,14 @@ if "%1" == "--loglevel" (
@rem add modules to CLASSPATH @rem add modules to CLASSPATH
set CLASSPATH=%CLASSPATH%;%HADOOP_MAPRED_HOME%\modules\* set CLASSPATH=%CLASSPATH%;%HADOOP_MAPRED_HOME%\modules\*
if %mapred-command% == classpath (
if not defined mapred-command-arguments (
@rem No need to bother starting up a JVM for this simple case.
@echo %CLASSPATH%
exit /b
)
)
call :%mapred-command% %mapred-command-arguments% call :%mapred-command% %mapred-command-arguments%
set java_arguments=%JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% %mapred-command-arguments% set java_arguments=%JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% %mapred-command-arguments%
call %JAVA% %java_arguments% call %JAVA% %java_arguments%
@ -102,7 +110,7 @@ goto :eof
:classpath :classpath
@echo %CLASSPATH% set CLASS=org.apache.hadoop.util.Classpath
goto :eof goto :eof
:job :job