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

svn merge -c 1433445 FIXES: MAPREDUCE-4936. JobImpl uber checks for cpu are wrong. Contributed by Arun C Murthy 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433446 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Darrell Lowe 2013-01-15 14:49:14 +00:00
parent 0ab4e6984f
commit 3943008b07
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,9 @@ Release 2.0.3-alpha - Unreleased
MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce
system JARs. (tomwhite) system JARs. (tomwhite)
MAPREDUCE-4936. JobImpl uber checks for cpu are wrong (Arun C Murthy via
jlowe)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

10
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
View File

@ -1068,9 +1068,13 @@ public class JobImpl implements org.apache.hadoop.mapreduce.v2.app.job.Job,
boolean smallCpu = boolean smallCpu =
( (
Math.max( Math.max(
conf.getInt(MRJobConfig.MAP_CPU_VCORES, 1), conf.getInt(
conf.getInt(MRJobConfig.REDUCE_CPU_VCORES, 1)) < MRJobConfig.MAP_CPU_VCORES,
sysCPUSizeForUberSlot MRJobConfig.DEFAULT_MAP_CPU_VCORES),
conf.getInt(
MRJobConfig.REDUCE_CPU_VCORES,
MRJobConfig.DEFAULT_REDUCE_CPU_VCORES))
<= sysCPUSizeForUberSlot
); );
boolean notChainJob = !isChainJob(conf); boolean notChainJob = !isChainJob(conf);