You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sn...@apache.org on 2020/06/10 16:16:50 UTC
[hadoop] branch branch-3.2 updated: YARN-10295. CapacityScheduler
NPE can cause apps to get stuck without resources. Contributed by Benjamin
Teke
This is an automated email from the ASF dual-hosted git repository.
snemeth pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 30d7a06 YARN-10295. CapacityScheduler NPE can cause apps to get stuck without resources. Contributed by Benjamin Teke
30d7a06 is described below
commit 30d7a06686fe6ee513f96f0b7aa25114285d2f85
Author: Szilard Nemeth <sn...@apache.org>
AuthorDate: Wed Jun 10 18:16:21 2020 +0200
YARN-10295. CapacityScheduler NPE can cause apps to get stuck without resources. Contributed by Benjamin Teke
---
.../resourcemanager/scheduler/capacity/CapacityScheduler.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/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 b/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
index bb3d7ca..e450e2a 100644
--- a/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
+++ b/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
@@ -1599,11 +1599,14 @@ public class CapacityScheduler extends
}
// 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org