From b9ef5aa79af33ab2bc252b236d7e62257e86a5f2 Mon Sep 17 00:00:00 2001 From: prabhujoseph Date: Thu, 7 Nov 2019 01:33:26 +0530 Subject: [PATCH] YARN-9937. Addendum patch to fix QueueACL. --- .../scheduler/capacity/CapacitySchedulerConfiguration.java | 2 +- .../resourcemanager/webapp/dao/CapacitySchedulerQueueInfo.java | 6 +++--- 2 files changed, 4 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/CapacitySchedulerConfiguration.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/CapacitySchedulerConfiguration.java index adf5e6b..c1ce6da 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/CapacitySchedulerConfiguration.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/CapacitySchedulerConfiguration.java @@ -402,7 +402,7 @@ public CapacitySchedulerConfiguration(Configuration configuration, } } - static String getQueuePrefix(String queue) { + public static String getQueuePrefix(String queue) { String queueName = PREFIX + queue + DOT; return queueName; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerQueueInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerQueueInfo.java index bde1bb1..f4d4070 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerQueueInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerQueueInfo.java @@ -131,7 +131,7 @@ CapacitySchedulerConfiguration conf = cs.getConfiguration(); queueAcls = new QueueAclsInfo(); for (Map.Entry e : conf - .getAcls(queueName).entrySet()) { + .getAcls(queuePath).entrySet()) { QueueAclInfo queueAcl = new QueueAclInfo(e.getKey().toString(), e.getValue().getAclString()); queueAcls.add(queueAcl); @@ -139,8 +139,8 @@ String aclApplicationMaxPriority = "acl_" + StringUtils.toLowerCase(AccessType.APPLICATION_MAX_PRIORITY.toString()); - String priorityAcls = conf.get(queuePath + aclApplicationMaxPriority, - conf.ALL_ACL); + String priorityAcls = conf.get(CapacitySchedulerConfiguration + .getQueuePrefix(queuePath) + aclApplicationMaxPriority, conf.ALL_ACL); QueueAclInfo queueAcl = new QueueAclInfo( AccessType.APPLICATION_MAX_PRIORITY.toString(), priorityAcls); -- 2.7.4 (Apple Git-66)