diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ConfiguredYarnAuthorizer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ConfiguredYarnAuthorizer.java index 36c52144f4d..a8dd49d0c1d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ConfiguredYarnAuthorizer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ConfiguredYarnAuthorizer.java @@ -77,18 +77,6 @@ private boolean checkPermissionInternal(AccessType accessType, ret = list.isUserAllowed(user); } } - - // recursively look up the queue to see if parent queue has the permission. - if (target.getType() == EntityType.QUEUE && !ret) { - String queueName = target.getName(); - if (!queueName.contains(".")) { - return ret; - } - String parentQueueName = - queueName.substring(0, queueName.lastIndexOf(".")); - return checkPermissionInternal(accessType, - new PrivilegedEntity(target.getType(), parentQueueName), user); - } return ret; } 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 dec6a84ed1a..5d4435dbb58 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 @@ -740,9 +740,8 @@ private static String getAclKey(QueueACL acl) { public AccessControlList getAcl(String queue, QueueACL acl) { String queuePrefix = getQueuePrefix(queue); - // The root queue defaults to all access if not defined - // Sub queues inherit access if not defined - String defaultAcl = queue.equals(ROOT) ? ALL_ACL : NONE_ACL; + // defaults is all access if not defined + String defaultAcl = ALL_ACL; String aclString = get(queuePrefix + getAclKey(acl), defaultAcl); return new AccessControlList(aclString); }