YARN-6248. user is not removed from UsersManagerâs when app is killed with pending container requests. Contributed by Eric Payne.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c1386a90 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c1386a90 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c1386a90 Branch: refs/heads/YARN-5972 Commit: c1386a90d7ff65b57be00a7245de82c31abb4665 Parents: c61bc2d Author: Sunil G <sun...@apache.org> Authored: Sat Mar 4 13:46:35 2017 +0530 Committer: Sunil G <sun...@apache.org> Committed: Sat Mar 4 13:46:35 2017 +0530 ---------------------------------------------------------------------- .../server/resourcemanager/scheduler/capacity/UsersManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1386a90/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 ---------------------------------------------------------------------- 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/UsersManager.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/UsersManager.java index 05503c6..c2134eb 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/UsersManager.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/UsersManager.java @@ -872,7 +872,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. --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
