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 jh...@apache.org on 2021/02/26 00:03:39 UTC
[hadoop] branch branch-3.3 updated: YARN-10651. CapacityScheduler
crashed with NPE in AbstractYarnScheduler.updateNodeResource(). Contributed
by Haibo Chen
This is an automated email from the ASF dual-hosted git repository.
jhung pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new be6e999 YARN-10651. CapacityScheduler crashed with NPE in AbstractYarnScheduler.updateNodeResource(). Contributed by Haibo Chen
be6e999 is described below
commit be6e99963ded94adf6f447ff53f2ba66b99120ca
Author: Jonathan Hung <jh...@linkedin.com>
AuthorDate: Thu Feb 25 15:08:43 2021 -0800
YARN-10651. CapacityScheduler crashed with NPE in AbstractYarnScheduler.updateNodeResource(). Contributed by Haibo Chen
(cherry picked from commit f348ab3f2f468751af329a1ffce4917cb000fcbf)
---
.../yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java | 5 +++++
1 file changed, 5 insertions(+)
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/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
index b3fc980..ae975fb 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
@@ -842,6 +842,11 @@ public abstract class AbstractYarnScheduler
writeLock.lock();
try {
SchedulerNode node = getSchedulerNode(nm.getNodeID());
+ if (node == null) {
+ LOG.info("Node: " + nm.getNodeID() + " has already been taken out of " +
+ "scheduling. Skip updating its resource");
+ return;
+ }
Resource newResource = resourceOption.getResource();
final int timeout = resourceOption.getOverCommitTimeout();
Resource oldResource = node.getTotalResource();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org