Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-9937. addendum: Add missing queue configs in RMWebService#CapacitySchedulerQueueInfo. Contributed by Prabhu Joseph

This commit is contained in:
Szilard Nemeth 2019-11-26 13:41:41 +01:00
parent 6c20512b68
commit 448ffb12ec
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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
View File

@ -402,7 +402,7 @@ public class CapacitySchedulerConfiguration extends ReservationSchedulerConfigur
} }
} }
static String getQueuePrefix(String queue) { public static String getQueuePrefix(String queue) {
String queueName = PREFIX + queue + DOT; String queueName = PREFIX + queue + DOT;
return queueName; return queueName;
} }

6
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
View File

@ -131,7 +131,7 @@ public class CapacitySchedulerQueueInfo {
CapacitySchedulerConfiguration conf = cs.getConfiguration(); CapacitySchedulerConfiguration conf = cs.getConfiguration();
queueAcls = new QueueAclsInfo(); queueAcls = new QueueAclsInfo();
for (Map.Entry<AccessType, AccessControlList> e : conf for (Map.Entry<AccessType, AccessControlList> e : conf
.getAcls(queueName).entrySet()) { .getAcls(queuePath).entrySet()) {
QueueAclInfo queueAcl = new QueueAclInfo(e.getKey().toString(), QueueAclInfo queueAcl = new QueueAclInfo(e.getKey().toString(),
e.getValue().getAclString()); e.getValue().getAclString());
queueAcls.add(queueAcl); queueAcls.add(queueAcl);
@ -139,8 +139,8 @@ public class CapacitySchedulerQueueInfo {
String aclApplicationMaxPriority = "acl_" + String aclApplicationMaxPriority = "acl_" +
StringUtils.toLowerCase(AccessType.APPLICATION_MAX_PRIORITY.toString()); StringUtils.toLowerCase(AccessType.APPLICATION_MAX_PRIORITY.toString());
String priorityAcls = conf.get(queuePath + aclApplicationMaxPriority, String priorityAcls = conf.get(CapacitySchedulerConfiguration
conf.ALL_ACL); .getQueuePrefix(queuePath) + aclApplicationMaxPriority, conf.ALL_ACL);
QueueAclInfo queueAcl = new QueueAclInfo( QueueAclInfo queueAcl = new QueueAclInfo(
AccessType.APPLICATION_MAX_PRIORITY.toString(), priorityAcls); AccessType.APPLICATION_MAX_PRIORITY.toString(), priorityAcls);