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

MAPREDUCE-5164. mapred job and queue commands omit HADOOP_CLIENT_OPTS. Contributed by Nemon Lou. 

Merged revision 1522595 from trunk.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522597 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Devarajulu K 2013-09-12 14:34:39 +00:00
parent 3d2ac297ec
commit 103226cc91
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,6 +125,9 @@ Release 2.1.1-beta - UNRELEASED
MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves) MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)
MAPREDUCE-5164. mapred job and queue commands omit HADOOP_CLIENT_OPTS
(Nemon Lou via devaraj)
Release 2.1.0-beta - 2013-08-22 Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/bin/mapred
View File

@ -61,8 +61,10 @@ esac
if [ "$COMMAND" = "job" ] ; then if [ "$COMMAND" = "job" ] ; then
CLASS=org.apache.hadoop.mapred.JobClient CLASS=org.apache.hadoop.mapred.JobClient
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "queue" ] ; then elif [ "$COMMAND" = "queue" ] ; then
CLASS=org.apache.hadoop.mapred.JobQueueClient CLASS=org.apache.hadoop.mapred.JobQueueClient
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "pipes" ] ; then elif [ "$COMMAND" = "pipes" ] ; then
CLASS=org.apache.hadoop.mapred.pipes.Submitter CLASS=org.apache.hadoop.mapred.pipes.Submitter
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS" HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"

2
hadoop-mapreduce-project/bin/mapred.cmd
View File

@ -103,10 +103,12 @@ goto :eof
:job :job
set CLASS=org.apache.hadoop.mapred.JobClient set CLASS=org.apache.hadoop.mapred.JobClient
set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS%
goto :eof goto :eof
:queue :queue
set CLASS=org.apache.hadoop.mapred.JobQueueClient set CLASS=org.apache.hadoop.mapred.JobQueueClient
set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS%
goto :eof goto :eof
:sampler :sampler