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:
parent
0ab4e6984f
commit
3943008b07
|
@ -94,6 +94,9 @@ Release 2.0.3-alpha - Unreleased
|
|||
MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce
|
||||
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
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -1068,9 +1068,13 @@ public class JobImpl implements org.apache.hadoop.mapreduce.v2.app.job.Job,
|
|||
boolean smallCpu =
|
||||
(
|
||||
Math.max(
|
||||
conf.getInt(MRJobConfig.MAP_CPU_VCORES, 1),
|
||||
conf.getInt(MRJobConfig.REDUCE_CPU_VCORES, 1)) <
|
||||
sysCPUSizeForUberSlot
|
||||
conf.getInt(
|
||||
MRJobConfig.MAP_CPU_VCORES,
|
||||
MRJobConfig.DEFAULT_MAP_CPU_VCORES),
|
||||
conf.getInt(
|
||||
MRJobConfig.REDUCE_CPU_VCORES,
|
||||
MRJobConfig.DEFAULT_REDUCE_CPU_VCORES))
|
||||
<= sysCPUSizeForUberSlot
|
||||
);
|
||||
boolean notChainJob = !isChainJob(conf);
|
||||
|
||||
|
|
Loading…
Reference in New Issue