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

YARN-10295. CapacityScheduler NPE can cause apps to get stuck without resources. Contributed by Benjamin Teke

Browse Source
This commit is contained in:
Szilard Nemeth 2020-06-10 18:16:21 +02:00
parent 8bef26a607
commit 30d7a06686
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
View File

@ -1599,11 +1599,14 @@ private CSAssignment allocateContainerOnSingleNode(
}
// Do not schedule if there are any reservations to fulfill on the node
if (node.getReservedContainer() != null) {
// node.getReservedContainer() is saved to the reservedContainer variable
// to ensure that a NPE described in YARN-10295 won't occur
reservedContainer = node.getReservedContainer();
if (reservedContainer != null) {
if (LOG.isDebugEnabled()) {
LOG.debug("Skipping scheduling since node " + node.getNodeID()
+ " is reserved by application " + node.getReservedContainer()
.getContainerId().getApplicationAttemptId());
+ " is reserved by application " + reservedContainer
.getContainerId().getApplicationAttemptId());
}
return null;
}