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/FairSchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java index ef417d4760f..2f689ec5a98 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java @@ -74,6 +74,8 @@ protected void render(Block html) { __("Demand Resources:", qinfo.getDemandResources().toString()). __("AM Used Resources:", qinfo.getAMUsedResources().toString()). __("AM Max Resources:", qinfo.getAMMaxResources().toString()). + __("Submit Applications ACL:", qinfo.getSubmitApplicationsACL()). + __("Administer Queue ACL:", qinfo.getAdministerQueueACL()). __("Num Active Applications:", qinfo.getNumActiveApplications()). __("Num Pending Applications:", qinfo.getNumPendingApplications()). __("Min Resources:", qinfo.getMinResources().toString()). 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/FairSchedulerQueueInfo.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/FairSchedulerQueueInfo.java index a4607c2ee95..c04a10dedce 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/FairSchedulerQueueInfo.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/FairSchedulerQueueInfo.java @@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; +import org.apache.hadoop.security.authorize.AccessControlList; +import org.apache.hadoop.yarn.api.records.QueueACL; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.AllocationConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSLeafQueue; @@ -62,6 +64,9 @@ private ResourceInfo fairResources; private ResourceInfo clusterResources; private ResourceInfo reservedResources; + + private AccessControlList submitApplicationsACL; + private AccessControlList administerQueueACL; private long pendingContainers; private long allocatedContainers; @@ -113,6 +118,10 @@ public FairSchedulerQueueInfo(FSQueue queue, FairScheduler scheduler) { fractionMemMaxShare = (float)maxResources.getMemorySize() / clusterResources.getMemorySize(); maxApps = queue.getMaxRunningApps(); + submitApplicationsACL = allocConf.getQueueAcl( + queueName, QueueACL.SUBMIT_APPLICATIONS); + administerQueueACL = allocConf.getQueueAcl( + queueName, QueueACL.ADMINISTER_QUEUE); pendingContainers = queue.getMetrics().getPendingContainers(); allocatedContainers = queue.getMetrics().getAllocatedContainers(); @@ -205,6 +214,14 @@ public int getMaxApplications() { return maxApps; } + public AccessControlList getSubmitApplicationsACL() { + return submitApplicationsACL; + } + + public AccessControlList getAdministerQueueACL() { + return administerQueueACL; + } + public String getQueueName() { return queueName; }