Skip to content

Commit f5345b8

Browse files
authored
YARN-11560. Fix NPE bug when multi-node enabled with schedule asynchronously (#6021). Contributed by wangzhongwei.
1 parent ae63d8e commit f5345b8

File tree

1 file changed

+4
-0
lines changed
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity

1 file changed

+4
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,6 +1737,10 @@ private CSAssignment allocateContainerOnSingleNode(
17371737

17381738
private void allocateFromReservedContainer(FiCaSchedulerNode node,
17391739
boolean withNodeHeartbeat, RMContainer reservedContainer) {
1740+
if(reservedContainer == null){
1741+
LOG.warn("reservedContainer is null, that may be unreserved by the proposal judgment thread");
1742+
return;
1743+
}
17401744
FiCaSchedulerApp reservedApplication = getCurrentAttemptForContainer(
17411745
reservedContainer.getContainerId());
17421746
if (reservedApplication == null) {

0 commit comments

Comments
 (0)