YARN-6248. user is not removed from UsersManager’s when app is killed with pending container requests. Contributed by Eric Payne.

(cherry picked from commit c1386a90d7ff65b57be00a7245de82c31abb4665)

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/UsersManager.java

@@ -966,7 +966,9 @@ public class UsersManager implements AbstractUsersManager {
       this.writeLock.lock();
 
       // For UT case: We might need to add the user to users list.
-      User user = getUserAndAddIfAbsent(userName);
+      User user = getUser(userName);
+      if (user == null) return;
+
       ResourceUsage resourceUsage = user.getResourceUsage();
       // If User is moved to non-active list, moved resource usage from
       // non-active to active list.