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 sh...@apache.org on 2018/03/31 01:03:54 UTC
hadoop git commit: YARN-7249. Fix CapacityScheduler NPE issue when a
container preempted while the node is being removed. Contributed by Wangda
Tan.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 d9df7cda6 -> dbdf662c0
YARN-7249. Fix CapacityScheduler NPE issue when a container preempted while the node is being removed. Contributed by Wangda Tan.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dbdf662c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dbdf662c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dbdf662c
Branch: refs/heads/branch-2.7
Commit: dbdf662c09d54d65234e4d0ccd2822fe1c6cf664
Parents: d9df7cd
Author: Eric Payne <ep...@apache.org>
Authored: Tue Sep 26 09:07:04 2017 -0500
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Fri Mar 30 18:02:22 2018 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../resourcemanager/scheduler/capacity/CapacityScheduler.java | 6 ++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dbdf662c/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d941950..786e3d1 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -26,6 +26,9 @@ Release 2.7.6 - UNRELEASED
YARN-7590. Improve container-executor validation check.
Contributed by Eric Yang.
+ YARN-7249. Fix CapacityScheduler NPE issue when a container preempted while
+ the node is being removed. (Wangda Tan via Eric Payne)
+
Release 2.7.5 - 2017-12-14
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dbdf662c/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
----------------------------------------------------------------------
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 ba5f66e..561cdd7 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
@@ -1428,6 +1428,12 @@ public class CapacityScheduler extends
// Get the node on which the container was allocated
FiCaSchedulerNode node = getNode(container.getNodeId());
+ if (node == null) {
+ LOG.info("Container=" + container + " of application=" + appId
+ + " completed with event=" + event + " on a node=" + container
+ .getNodeId() + ". However the node might be already removed by RM.");
+ return;
+ }
// Inform the queue
LeafQueue queue = (LeafQueue)application.getQueue();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org