You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jh...@apache.org on 2019/08/23 17:03:26 UTC
[hadoop] branch branch-2 updated: YARN-8025.
UsersManangers#getComputedResourceLimitForActiveUsers throws NPE due to
preComputedActiveUserLimit is empty. Contributed by Tao Yang.
This is an automated email from the ASF dual-hosted git repository.
jhung pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 97f207d YARN-8025. UsersManangers#getComputedResourceLimitForActiveUsers throws NPE due to preComputedActiveUserLimit is empty. Contributed by Tao Yang.
97f207d is described below
commit 97f207d1a9d328c24745ed5a0c9583079be1dde3
Author: Weiwei Yang <ww...@apache.org>
AuthorDate: Mon May 7 11:33:14 2018 +0800
YARN-8025. UsersManangers#getComputedResourceLimitForActiveUsers throws NPE due to preComputedActiveUserLimit is empty. Contributed by Tao Yang.
(Cherry picked from commit 67f239c42f676237290d18ddbbc9aec369267692)
(cherry picked from commit a0b7abf278c147d3ae7821c6783a85cb972c6ec2)
---
.../server/resourcemanager/scheduler/capacity/UsersManager.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
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 6519972..02836d2 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
@@ -491,11 +491,12 @@ public class UsersManager implements AbstractUsersManager {
Resource clusterResource, String nodePartition,
SchedulingMode schedulingMode) {
- Map<SchedulingMode, Resource> userLimitPerSchedulingMode = preComputedActiveUserLimit
- .get(nodePartition);
+ Map<SchedulingMode, Resource> userLimitPerSchedulingMode;
try {
writeLock.lock();
+ userLimitPerSchedulingMode =
+ preComputedActiveUserLimit.get(nodePartition);
if (isRecomputeNeeded(schedulingMode, nodePartition, true)) {
// recompute
userLimitPerSchedulingMode = reComputeUserLimits(userName,
@@ -549,11 +550,11 @@ public class UsersManager implements AbstractUsersManager {
Resource clusterResource, String nodePartition,
SchedulingMode schedulingMode) {
- Map<SchedulingMode, Resource> userLimitPerSchedulingMode = preComputedAllUserLimit
- .get(nodePartition);
+ Map<SchedulingMode, Resource> userLimitPerSchedulingMode;
try {
writeLock.lock();
+ userLimitPerSchedulingMode = preComputedAllUserLimit.get(nodePartition);
if (isRecomputeNeeded(schedulingMode, nodePartition, false)) {
// recompute
userLimitPerSchedulingMode = reComputeUserLimits(userName,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org