MAPREDUCE-5546. mapred.cmd on Windows set HADOOP_OPTS incorrectly. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532016 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
87d7fae5c6
commit
ed45d97ed7
@ -213,6 +213,9 @@ Release 2.2.1 - UNRELEASED
|
||||
MAPREDUCE-5569. FloatSplitter is not generating correct splits (Nathan
|
||||
Roberts via jlowe)
|
||||
|
||||
MAPREDUCE-5546. mapred.cmd on Windows set HADOOP_OPTS incorrectly (Chuan Liu
|
||||
via cnauroth)
|
||||
|
||||
Release 2.2.0 - 2013-10-13
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
@ -91,7 +91,7 @@ if "%1" == "--config" (
|
||||
set CLASSPATH=%CLASSPATH%;%HADOOP_MAPRED_HOME%\modules\*
|
||||
|
||||
call :%mapred-command% %mapred-command-arguments%
|
||||
set java_arguments=%JAVA_HEAP_MAX% %MAPRED_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%
|
||||
|
||||
goto :eof
|
||||
@ -118,7 +118,7 @@ goto :eof
|
||||
|
||||
:historyserver
|
||||
set CLASS=org.apache.hadoop.mapreduce.v2.hs.JobHistoryServer
|
||||
set HADOOP_OPTS=%HADOOP_OPTS% -Dmapred.jobsummary.logger=%HADOOP_JHS_LOGGER% %HADOOP_JOB_HISTORYSERVER_OPTS%"
|
||||
set HADOOP_OPTS=%HADOOP_OPTS% -Dmapred.jobsummary.logger=%HADOOP_JHS_LOGGER% %HADOOP_JOB_HISTORYSERVER_OPTS%
|
||||
if defined HADOOP_JOB_HISTORYSERVER_HEAPSIZE (
|
||||
set JAVA_HEAP_MAX=-Xmx%HADOOP_JOB_HISTORYSERVER_HEAPSIZE%m
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user