hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From epa...@apache.org
Subject hadoop git commit: YARN-6248. user is not removed from UsersManager’s when app is killed with pending container requests. Contributed by Eric Payne.
Date Thu, 07 Sep 2017 20:34:29 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 6e20ae954 -> ef342455c


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)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ef342455
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ef342455
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ef342455

Branch: refs/heads/branch-2
Commit: ef342455cbc7c440a82d781761542243863e1351
Parents: 6e20ae9
Author: Sunil G <sunilg@apache.org>
Authored: Sat Mar 4 13:46:35 2017 +0530
Committer: Eric Payne <epayne@apache.org>
Committed: Thu Sep 7 14:47:07 2017 -0500

----------------------------------------------------------------------
 .../server/resourcemanager/scheduler/capacity/UsersManager.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef342455/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 ed49cef..5f7d185 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
@@ -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.


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message