From 35eff545560d9275a03d3d2dcb019d7cdfc39e3e Mon Sep 17 00:00:00 2001 From: Benjamin Teke Date: Thu, 7 Oct 2021 20:11:42 +0200 Subject: [PATCH] YARN-10934. Fix LeafQueue#activateApplication NPE when the user of the pending application is missing from usersManager. Contributed by Benjamin Teke Co-authored-by: Benjamin Teke --- .../server/resourcemanager/scheduler/capacity/LeafQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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/LeafQueue.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/LeafQueue.java index 2c0593d0fc..9352a0fe7b 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/LeafQueue.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/LeafQueue.java @@ -878,7 +878,7 @@ public class LeafQueue extends AbstractCSQueue { } // Check user am resource limit - User user = getUser(application.getUser()); + User user = usersManager.getUserAndAddIfAbsent(application.getUser()); Resource userAMLimit = userAmPartitionLimit.get(partitionName); // Verify whether we already calculated user-am-limit for this label.