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

YARN-5185. StageAllocaterGreedyRLE: Fix NPE in corner case. (Carlo Curino via asuresh)

This commit is contained in:
Arun Suresh 2016-06-06 21:06:52 -07:00
parent 6de9213df1
commit 7a9b7372a1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/StageAllocatorGreedyRLE.java
View File

@ -168,12 +168,20 @@ public Map<ReservationInterval, Resource> computeStageAllocation(Plan plan,
if (allocateLeft) { if (allocateLeft) {
// set earliest start to the min of the constraining "range" or my the // set earliest start to the min of the constraining "range" or my the
// end of this allocation // end of this allocation
stageEarliestStart = if(partialMap.higherKey(minPoint) == null){
Math.min(partialMap.higherKey(minPoint), stageEarliestStart + dur); stageEarliestStart = stageEarliestStart + dur;
} else {
stageEarliestStart =
Math.min(partialMap.higherKey(minPoint), stageEarliestStart + dur);
}
} else { } else {
// same as above moving right-to-left // same as above moving right-to-left
stageDeadline = if(partialMap.higherKey(minPoint) == null){
Math.max(partialMap.higherKey(minPoint), stageDeadline - dur); stageDeadline = stageDeadline - dur;
} else {
stageDeadline =
Math.max(partialMap.higherKey(minPoint), stageDeadline - dur);
}
} }
} }