Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 43272200C3F for ; Wed, 8 Mar 2017 00:10:25 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 41CEB160B82; Tue, 7 Mar 2017 23:10:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8B875160B85 for ; Wed, 8 Mar 2017 00:10:24 +0100 (CET) Received: (qmail 85838 invoked by uid 500); 7 Mar 2017 23:10:17 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 84093 invoked by uid 99); 7 Mar 2017 23:10:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Mar 2017 23:10:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BBB1DFD9E; Tue, 7 Mar 2017 23:10:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: kkaranasos@apache.org To: common-commits@hadoop.apache.org Date: Tue, 07 Mar 2017 23:10:43 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B29/50=5D_hadoop_git_commit=3A_YARN-6248=2E_user_is_no?= =?utf-8?q?t_removed_from_UsersManager=E2=80=99s_when_app_is_killed_with_pen?= =?utf-8?q?ding_container_requests=2E_Contributed_by_Eric_Payne=2E?= archived-at: Tue, 07 Mar 2017 23:10:25 -0000 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 Authored: Sat Mar 4 13:46:35 2017 +0530 Committer: Sunil G 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-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org