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 e0add1e8f5a..a0f4fc088a1 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 @@ -1750,6 +1750,15 @@ public void setAutoCreatedLeafQueueConfigCapacity(String queuePath, setCapacity(leafQueueConfPrefix, val); } + @VisibleForTesting + @Private + public void setAutoCreatedLeafQueueTemplateCapacityByLabel(String queuePath, + String label, float val) { + String leafQueueConfPrefix = getAutoCreatedQueueTemplateConfPrefix( + queuePath); + setCapacityByLabel(leafQueueConfPrefix, label, val); + } + @Private @VisibleForTesting public void setAutoCreatedLeafQueueConfigMaxCapacity(String queuePath, @@ -1759,6 +1768,15 @@ public void setAutoCreatedLeafQueueConfigMaxCapacity(String queuePath, setMaximumCapacity(leafQueueConfPrefix, val); } + @Private + @VisibleForTesting + public void setAutoCreatedLeafQueueTemplateMaxCapacity(String queuePath, + String label, float val) { + String leafQueueConfPrefix = getAutoCreatedQueueTemplateConfPrefix( + queuePath); + setMaximumCapacityByLabel(leafQueueConfPrefix, label, val); + } + @VisibleForTesting @Private public void setAutoCreatedLeafQueueConfigUserLimit(String queuePath, 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/queuemanagement/GuaranteedOrZeroCapacityOverTimePolicy.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/queuemanagement/GuaranteedOrZeroCapacityOverTimePolicy.java index c1196ecd4a6..db291c14967 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/queuemanagement/GuaranteedOrZeroCapacityOverTimePolicy.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/queuemanagement/GuaranteedOrZeroCapacityOverTimePolicy.java @@ -85,8 +85,6 @@ private static final Log LOG = LogFactory.getLog( GuaranteedOrZeroCapacityOverTimePolicy.class); - private AutoCreatedLeafQueueConfig ZERO_CAPACITY_ENTITLEMENT; - private ReentrantReadWriteLock.WriteLock writeLock; private ReentrantReadWriteLock.ReadLock readLock; @@ -96,13 +94,72 @@ private AutoCreatedLeafQueueConfig leafQueueTemplate; private QueueCapacities leafQueueTemplateCapacities; + + private Set leafQueueTemplateNodeLabels; - private Map leafQueueStateMap = new HashMap<>(); + private LeafQueueState leafQueueState = new LeafQueueState(); private Clock clock = new MonotonicClock(); private class LeafQueueState { + //map of queueName-> partition->{leaf queue's state} + private Map> leafQueueStateMap = new + HashMap<>(); + + public boolean containsLeafQueue(String leafQueueName, String partition) { + if( leafQueueStateMap.containsKey(leafQueueName) ) { + return leafQueueStateMap.get(leafQueueName).containsKey(partition); + } + return false; + } + + public boolean containsLeafQueue(String leafQueueName) { + if( leafQueueStateMap.containsKey(leafQueueName) ) { + return true; + } + return false; + } + + private boolean addLeafQueueStateIfNotExists(String leafQueueName, String + partition, LeafQueueStatePerPartition leafQueueState) { + if (!containsLeafQueue(leafQueueName)) { + leafQueueStateMap.put(leafQueueName, new HashMap<>()); + } + if ( !containsLeafQueue(leafQueueName, partition)) { + leafQueueStateMap.get(leafQueueName).put(partition, leafQueueState); + return true; + } + return false; + } + + public boolean createLeafQueueStateIfNotExists(LeafQueue leafQueue, String + partition) { + return addLeafQueueStateIfNotExists(leafQueue.getQueueName(), + partition, new LeafQueueStatePerPartition()); + } + + public LeafQueueStatePerPartition getLeafQueueStatePerPartition(String + leafQueueName, String partition) { + if( leafQueueStateMap.get(leafQueueName) != null) { + return leafQueueStateMap.get(leafQueueName).get(partition); + } + return null; + } + + public Map> + getLeafQueueStateMap() { + return leafQueueStateMap; + } + + private void clear() { + leafQueueStateMap.clear(); + } + } + + + private class LeafQueueStatePerPartition { + private AtomicBoolean isActive = new AtomicBoolean(false); private long mostRecentActivationTime; @@ -139,28 +196,6 @@ private boolean deactivate() { } } - private boolean containsLeafQueue(String leafQueueName) { - return leafQueueStateMap.containsKey(leafQueueName); - } - - private boolean addLeafQueueStateIfNotExists(String leafQueueName, - LeafQueueState - leafQueueState) { - if ( !containsLeafQueue(leafQueueName)) { - leafQueueStateMap.put(leafQueueName, leafQueueState); - return true; - } - return false; - } - - private boolean addLeafQueueStateIfNotExists(LeafQueue leafQueue) { - return addLeafQueueStateIfNotExists(leafQueue.getQueueName(), new LeafQueueState()); - } - - private void clearLeafQueueState() { - leafQueueStateMap.clear(); - } - private class ParentQueueState { private Map @@ -264,7 +299,6 @@ public void init(final CapacitySchedulerContext schedulerContext, ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); readLock = lock.readLock(); writeLock = lock.writeLock(); - if (!(parentQueue instanceof ManagedParentQueue)) { throw new IllegalArgumentException( "Expected instance of type " + ManagedParentQueue.class); @@ -273,8 +307,8 @@ public void init(final CapacitySchedulerContext schedulerContext, this.parentQueue = (ManagedParentQueue) parentQueue; initializeLeafQueueTemplate(this.parentQueue); - - LOG.info("Initialized queue management policy for parent queue " + + LOG.info("Initialized queue management policy for parent queue " + parentQueue.getQueueName()); } @@ -283,8 +317,8 @@ private void initializeLeafQueueTemplate(ManagedParentQueue parentQueue) { leafQueueTemplateCapacities = leafQueueTemplate.getQueueCapacities(); - ZERO_CAPACITY_ENTITLEMENT = buildTemplate(0.0f, - leafQueueTemplateCapacities.getMaximumCapacity()); + leafQueueTemplateNodeLabels = leafQueueTemplateCapacities + .getExistingNodeLabels(); } @Override @@ -298,71 +332,94 @@ private void initializeLeafQueueTemplate(ManagedParentQueue parentQueue) { try { readLock.lock(); List queueManagementChanges = new ArrayList<>(); + List pendingApps = getSortedPendingApplications(); - // check if any leaf queues need to be deactivated based on pending - // applications and - float parentAbsoluteCapacity = parentQueue.getQueueCapacities() - .getAbsoluteCapacity(); + //Map of LeafQueue->QueueCapacities - keep adding the computed + // entitlements to this map and finally + // build the leaf queue configuration Template for all identified leaf + // queues + Map leafQueueEntitlements = new HashMap<>(); - float leafQueueTemplateAbsoluteCapacity = - leafQueueTemplateCapacities.getAbsoluteCapacity(); - Map deactivatedLeafQueues = - deactivateLeafQueuesIfInActive(parentQueue, queueManagementChanges); + for (String nodeLabel : leafQueueTemplateNodeLabels) { + // check if any leaf queues need to be deactivated based on pending + // applications + float parentAbsoluteCapacity = parentQueue.getQueueCapacities() + .getAbsoluteCapacity(nodeLabel); + float leafQueueTemplateAbsoluteCapacity = + leafQueueTemplateCapacities.getAbsoluteCapacity(nodeLabel); + Map deactivatedLeafQueues = deactivateLeafQueuesIfInActive( + parentQueue, nodeLabel, leafQueueEntitlements); float deactivatedCapacity = getTotalDeactivatedCapacity - (deactivatedLeafQueues); - - float sumOfChildQueueActivatedCapacity = parentQueueState. - getAbsoluteActivatedChildQueueCapacity(); - - //Check if we need to activate anything at all? - float availableCapacity = getAvailableCapacity(parentAbsoluteCapacity, - deactivatedCapacity, sumOfChildQueueActivatedCapacity); - - if (LOG.isDebugEnabled()) { - LOG.debug("Parent queue : " + parentQueue.getQueueName() - + " absCapacity = " + parentAbsoluteCapacity - + ", leafQueueAbsoluteCapacity = " + - leafQueueTemplateAbsoluteCapacity - + ", deactivatedCapacity = " + deactivatedCapacity - + " , absChildActivatedCapacity = " - + sumOfChildQueueActivatedCapacity + ", availableCapacity = " + - availableCapacity); - } + (deactivatedLeafQueues, nodeLabel); - if (availableCapacity >= leafQueueTemplateAbsoluteCapacity) { - //sort applications across leaf queues by submit time - List pendingApps = getSortedPendingApplications(); + float sumOfChildQueueActivatedCapacity = parentQueueState. + getAbsoluteActivatedChildQueueCapacity(nodeLabel); - if (pendingApps.size() > 0) { - int maxLeafQueuesTobeActivated = getMaxLeavesToBeActivated( - availableCapacity, leafQueueTemplateAbsoluteCapacity, - pendingApps.size()); + //Check if we need to activate anything at all? + float availableCapacity = getAvailableCapacity(parentAbsoluteCapacity, + deactivatedCapacity, sumOfChildQueueActivatedCapacity); - if (LOG.isDebugEnabled()) { - LOG.debug("Found " + maxLeafQueuesTobeActivated - + " leaf queues to be activated with " + pendingApps.size() - + " apps "); - } + if (LOG.isDebugEnabled()) { + LOG.debug("Parent queue : " + parentQueue.getQueueName() + + ", nodeLabel = " + nodeLabel + + ", absCapacity = " + parentAbsoluteCapacity + + ", leafQueueAbsoluteCapacity = " + + leafQueueTemplateAbsoluteCapacity + + ", deactivatedCapacity = " + deactivatedCapacity + + " , absChildActivatedCapacity = " + + sumOfChildQueueActivatedCapacity + ", availableCapacity = " + + availableCapacity); + } + + if (availableCapacity >= leafQueueTemplateAbsoluteCapacity) { + //sort applications across leaf queues by submit time + if (pendingApps.size() > 0) { + int maxLeafQueuesTobeActivated = getMaxLeavesToBeActivated( + availableCapacity, leafQueueTemplateAbsoluteCapacity, + pendingApps.size()); + + if (LOG.isDebugEnabled()) { + LOG.debug("Found " + maxLeafQueuesTobeActivated + " leaf queues" + + " to be activated with " + pendingApps.size() + + " apps "); + } - LinkedHashSet leafQueuesToBeActivated = getSortedLeafQueues( - pendingApps, maxLeafQueuesTobeActivated, deactivatedLeafQueues - .keySet()); + LinkedHashSet leafQueuesToBeActivated = + getSortedLeafQueues(nodeLabel, pendingApps, + maxLeafQueuesTobeActivated, deactivatedLeafQueues.keySet()); - //Compute entitlement changes for the identified leaf queues - // which is appended to the List of queueManagementChanges - computeQueueManagementChanges(leafQueuesToBeActivated, - queueManagementChanges, availableCapacity, - leafQueueTemplateAbsoluteCapacity); + //Compute entitlement changes for the identified leaf queues + // which is appended to the List of computedEntitlements + updateLeafQueueCapacitiesByLabel(nodeLabel, leafQueuesToBeActivated, + leafQueueEntitlements); - if( LOG.isDebugEnabled()) { - if ( leafQueuesToBeActivated.size() > 0) { - LOG.debug("Activated leaf queues : [" + - leafQueuesToBeActivated + "]"); + if( LOG.isDebugEnabled()) { + if ( leafQueuesToBeActivated.size() > 0) { + LOG.debug("Activated leaf queues : [" + + leafQueuesToBeActivated + "]"); + } } } } } + + //Populate new entitlements + + for (final Iterator> iterator = + leafQueueEntitlements.entrySet().iterator(); iterator.hasNext();) { + Map.Entry queueCapacities = iterator.next(); + String leafQueueName = queueCapacities.getKey(); + AutoCreatedLeafQueue leafQueue = + (AutoCreatedLeafQueue) scheduler.getCapacitySchedulerQueueManager() + .getQueue(leafQueueName); + AutoCreatedLeafQueueConfig newTemplate = buildTemplate( + queueCapacities.getValue()); + queueManagementChanges.add( + new QueueManagementChange.UpdateQueue(leafQueue, + newTemplate)); + + } return queueManagementChanges; } finally { readLock.unlock(); @@ -370,14 +427,14 @@ private void initializeLeafQueueTemplate(ManagedParentQueue parentQueue) { } private float getTotalDeactivatedCapacity( - Map deactivatedLeafQueues) { + Map deactivatedLeafQueues, String nodeLabel) { float deactivatedCapacity = 0; for (Iterator> iterator = deactivatedLeafQueues.entrySet().iterator(); iterator.hasNext(); ) { Map.Entry deactivatedQueueCapacity = iterator .next(); deactivatedCapacity += deactivatedQueueCapacity.getValue() - .getAbsoluteCapacity(); + .getAbsoluteCapacity(nodeLabel); } return deactivatedCapacity; } @@ -389,14 +446,20 @@ void updateLeafQueueState() { Set newQueues = new HashSet<>(); for (CSQueue newQueue : parentQueue.getChildQueues()) { if (newQueue instanceof LeafQueue) { - addLeafQueueStateIfNotExists((LeafQueue) newQueue); + for (String nodeLabel : + leafQueueTemplateNodeLabels) { + leafQueueState.createLeafQueueStateIfNotExists((LeafQueue) + newQueue, nodeLabel); + } newQueues.add(newQueue.getQueueName()); } } - for (Iterator> itr = - leafQueueStateMap.entrySet().iterator(); itr.hasNext(); ) { - Map.Entry e = itr.next(); + for (Iterator>> itr = + leafQueueState.getLeafQueueStateMap().entrySet().iterator(); itr + .hasNext(); ) { + Map.Entry> e = itr.next(); String queueName = e.getKey(); if (!newQueues.contains(queueName)) { itr.remove(); @@ -407,14 +470,13 @@ void updateLeafQueueState() { } } - private LinkedHashSet getSortedLeafQueues( + private LinkedHashSet getSortedLeafQueues(String nodeLabel, final List pendingApps, int leafQueuesNeeded, Set deactivatedQueues) throws SchedulerDynamicEditException { LinkedHashSet leafQueues = new LinkedHashSet<>(leafQueuesNeeded); int ctr = 0; for (FiCaSchedulerApp app : pendingApps) { - AutoCreatedLeafQueue leafQueue = (AutoCreatedLeafQueue) app.getCSLeafQueue(); String leafQueueName = leafQueue.getQueueName(); @@ -422,7 +484,7 @@ void updateLeafQueueState() { //Check if leafQueue is not active already and has any pending apps if (ctr < leafQueuesNeeded) { - if (!isActive(leafQueue)) { + if (!isActive(leafQueue, nodeLabel)) { if (!deactivatedQueues.contains(leafQueueName)) { if (addLeafQueueIfNotExists(leafQueues, leafQueueName)) { ctr++; @@ -446,77 +508,64 @@ private boolean addLeafQueueIfNotExists(Set leafQueues, } @VisibleForTesting - public boolean isActive(final AutoCreatedLeafQueue leafQueue) + public boolean isActive(final AutoCreatedLeafQueue leafQueue, String + nodeLabel) throws SchedulerDynamicEditException { try { readLock.lock(); - LeafQueueState leafQueueStatus = getLeafQueueState(leafQueue); + LeafQueueStatePerPartition leafQueueStatus = getLeafQueueState(leafQueue, + nodeLabel); return leafQueueStatus.isActive(); } finally { readLock.unlock(); } } - private Map deactivateLeafQueuesIfInActive(ParentQueue - parentQueue, - List queueManagementChanges) + private Map deactivateLeafQueuesIfInActive(ParentQueue parentQueue, + String nodeLabel, Map leafQueueEntitlements) throws SchedulerDynamicEditException { Map deactivatedQueues = new HashMap<>(); for (CSQueue childQueue : parentQueue.getChildQueues()) { AutoCreatedLeafQueue leafQueue = (AutoCreatedLeafQueue) childQueue; + if (leafQueue != null) { + if (isActive(leafQueue, nodeLabel) && !hasPendingApps(leafQueue)) { + if ( !leafQueueEntitlements.containsKey(leafQueue.getQueueName())) { + leafQueueEntitlements.put(leafQueue.getQueueName(), new QueueCapacities(false)); + } - if (isActive(leafQueue) && !hasPendingApps(leafQueue)) { - queueManagementChanges.add( - new QueueManagementChange.UpdateQueue(leafQueue, - ZERO_CAPACITY_ENTITLEMENT)); - deactivatedQueues.put(leafQueue.getQueueName(), - leafQueueTemplateCapacities); - } else{ - if (LOG.isDebugEnabled()) { - LOG.debug(" Leaf queue has pending applications : " + leafQueue - .getNumApplications() + ".Skipping deactivation for " - + leafQueue); + QueueCapacities capacities = leafQueueEntitlements.get(leafQueue.getQueueName()); + updateZeroCapacity(capacities, nodeLabel); + deactivatedQueues.put(leafQueue.getQueueName(), + leafQueueTemplateCapacities); + } else{ + if (LOG.isDebugEnabled()) { + LOG.debug(" Leaf queue has pending applications or is " + "inactive" + + " : " + leafQueue.getNumApplications() + + ".Skipping deactivation for " + leafQueue); + } } + } else{ + LOG.warn( + "Could not find queue in scheduler while trying" + " to deactivate " + + childQueue.getQueueName()); } } - if (LOG.isDebugEnabled()) { - if (deactivatedQueues.size() > 0) { - LOG.debug("Deactivated leaf queues : " + deactivatedQueues); - } - } return deactivatedQueues; } - private void computeQueueManagementChanges( - Set leafQueuesToBeActivated, - List queueManagementChanges, - final float availableCapacity, - final float leafQueueTemplateAbsoluteCapacity) { - - float curAvailableCapacity = availableCapacity; - + private void updateLeafQueueCapacitiesByLabel(String nodeLabel, + Set leafQueuesToBeActivated, Map + leafQueueEntitlements) { for (String curLeafQueue : leafQueuesToBeActivated) { + if ( !leafQueueEntitlements.containsKey(curLeafQueue)) { + leafQueueEntitlements.put(curLeafQueue, new QueueCapacities(false)); // Activate queues if capacity is available - if (curAvailableCapacity >= leafQueueTemplateAbsoluteCapacity) { - AutoCreatedLeafQueue leafQueue = - (AutoCreatedLeafQueue) scheduler.getCapacitySchedulerQueueManager() - .getQueue(curLeafQueue); - if (leafQueue != null) { - AutoCreatedLeafQueueConfig newTemplate = - buildTemplate(leafQueueTemplateCapacities.getCapacity(), - leafQueueTemplateCapacities.getMaximumCapacity()); - queueManagementChanges.add( - new QueueManagementChange.UpdateQueue(leafQueue, - newTemplate)); - curAvailableCapacity -= leafQueueTemplateAbsoluteCapacity; - } else{ - LOG.warn( - "Could not find queue in scheduler while trying to deactivate " - + curLeafQueue); - } } + + QueueCapacities capacities = leafQueueEntitlements.get(curLeafQueue); + updateCapacityFromTemplate(capacities, nodeLabel); } } @@ -569,25 +618,27 @@ public void commitQueueManagementChanges( AutoCreatedLeafQueue leafQueue = (AutoCreatedLeafQueue) queue; - if (updatedQueueTemplate.getQueueCapacities().getCapacity() > 0) { - if (isActive(leafQueue)) { - if (LOG.isDebugEnabled()) { - LOG.debug( - "Queue is already active. Skipping activation : " + queue - .getQueuePath()); + for (String nodeLabel : updatedQueueTemplate.getQueueCapacities() + .getExistingNodeLabels()) { + if (updatedQueueTemplate.getQueueCapacities(). + getCapacity(nodeLabel) > 0) { + if (isActive(leafQueue, nodeLabel)) { + if ( LOG.isDebugEnabled()) { + LOG.debug("Queue is already active." + " Skipping activation : " + + queue.getQueuePath()); + } + } else{ + activate(leafQueue, nodeLabel); } } else{ - activate(leafQueue); - } - } else{ - if (!isActive(leafQueue)) { - if (LOG.isDebugEnabled()) { - LOG.debug("Queue is already de-activated. " - + "Skipping de-activation " - + ": " + leafQueue.getQueuePath()); + if (!isActive(leafQueue, nodeLabel)) { + if ( LOG.isDebugEnabled()) { + LOG.debug("Queue is already de-activated. Skipping " + + "de-activation : " + leafQueue.getQueuePath()); + } + } else{ + deactivate(leafQueue, nodeLabel); } - } else{ - deactivate(leafQueue); } } } @@ -596,32 +647,28 @@ public void commitQueueManagementChanges( } } - private void activate(final AutoCreatedLeafQueue leafQueue) + private void activate(final AutoCreatedLeafQueue leafQueue, String nodeLabel) throws SchedulerDynamicEditException { try { writeLock.lock(); - getLeafQueueState(leafQueue).activate(); - - parentQueueState.incAbsoluteActivatedChildCapacity(NO_LABEL, + getLeafQueueState(leafQueue, nodeLabel).activate(); + parentQueueState.incAbsoluteActivatedChildCapacity(nodeLabel, leafQueueTemplateCapacities - .getAbsoluteCapacity()); + .getAbsoluteCapacity(nodeLabel)); } finally { writeLock.unlock(); } } - private void deactivate(final AutoCreatedLeafQueue leafQueue) - throws SchedulerDynamicEditException { + private void deactivate(final AutoCreatedLeafQueue leafQueue, String + nodeLabel) throws SchedulerDynamicEditException { try { writeLock.lock(); - getLeafQueueState(leafQueue).deactivate(); + getLeafQueueState(leafQueue, nodeLabel).deactivate(); - for (String nodeLabel: parentQueue.getQueueCapacities() - .getExistingNodeLabels()) { - parentQueueState.decAbsoluteActivatedChildCapacity(nodeLabel, - leafQueueTemplateCapacities - .getAbsoluteCapacity()); - } + parentQueueState.decAbsoluteActivatedChildCapacity(nodeLabel, + leafQueueTemplateCapacities + .getAbsoluteCapacity(nodeLabel)); } finally { writeLock.unlock(); } @@ -653,7 +700,7 @@ public void reinitialize(CapacitySchedulerContext schedulerContext, final //clear state parentQueueState.clear(); - clearLeafQueueState(); + leafQueueState.clear(); LOG.info("Reinitialized queue management policy for parent queue " + parentQueue.getQueueName()); @@ -664,44 +711,71 @@ public void reinitialize(CapacitySchedulerContext schedulerContext, final (AutoCreatedLeafQueue leafQueue) throws SchedulerDynamicEditException { - AutoCreatedLeafQueueConfig template = ZERO_CAPACITY_ENTITLEMENT; + AutoCreatedLeafQueueConfig template; try { writeLock.lock(); - if (!addLeafQueueStateIfNotExists(leafQueue)) { - LOG.error("Leaf queue already exists in state : " - + getLeafQueueState(leafQueue)); - throw new SchedulerDynamicEditException( - "Leaf queue already exists in state : " + getLeafQueueState( - leafQueue)); - } - float availableCapacity = getAvailableCapacity( - parentQueue.getQueueCapacities().getAbsoluteCapacity(), 0, - parentQueueState.getAbsoluteActivatedChildQueueCapacity()); + QueueCapacities capacities = new QueueCapacities(false); + for (String nodeLabel : + leafQueueTemplateNodeLabels) { + if (!leafQueueState.createLeafQueueStateIfNotExists(leafQueue, + nodeLabel)) { + String message = "Leaf queue already exists in state : " + + getLeafQueueState(leafQueue, nodeLabel); + LOG.error(message); + } + + float availableCapacity = + getAvailableCapacity( + parentQueue.getQueueCapacities().getAbsoluteCapacity(nodeLabel) + , 0, + parentQueueState. + getAbsoluteActivatedChildQueueCapacity(nodeLabel)); - if (availableCapacity >= leafQueueTemplateCapacities - .getAbsoluteCapacity()) { - activate(leafQueue); - template = buildTemplate(leafQueueTemplateCapacities.getCapacity(), - leafQueueTemplateCapacities.getMaximumCapacity()); + if (availableCapacity >= + leafQueueTemplateCapacities.getAbsoluteCapacity(nodeLabel)) { + + updateCapacityFromTemplate(capacities, nodeLabel); + activate(leafQueue, nodeLabel); + } else{ + updateZeroCapacity(capacities, nodeLabel); + } } + + template = buildTemplate(capacities); } finally { writeLock.unlock(); } return template; } + private void updateZeroCapacity(QueueCapacities capacities, String + nodeLabel) { + capacities.setCapacity(nodeLabel, 0.0f); + capacities.setMaximumCapacity(nodeLabel, leafQueueTemplateCapacities + .getMaximumCapacity(nodeLabel)); + } + + private void updateCapacityFromTemplate(QueueCapacities capacities, String + nodeLabel) { + capacities.setCapacity(nodeLabel, leafQueueTemplateCapacities + .getCapacity(nodeLabel)); + capacities.setMaximumCapacity(nodeLabel, leafQueueTemplateCapacities + .getMaximumCapacity(nodeLabel)); + } + @VisibleForTesting - LeafQueueState getLeafQueueState(LeafQueue queue) + LeafQueueStatePerPartition getLeafQueueState(LeafQueue queue, String partition) throws SchedulerDynamicEditException { try { readLock.lock(); String queueName = queue.getQueueName(); - if (!containsLeafQueue(queueName)) { + if (!leafQueueState.containsLeafQueue(queueName, partition)) { throw new SchedulerDynamicEditException( "Could not find leaf queue in " + "state " + queueName); } else{ - return leafQueueStateMap.get(queueName); + return leafQueueState. + getLeafQueueStatePerPartition(queueName, partition); } } finally { readLock.unlock(); @@ -709,8 +783,8 @@ LeafQueueState getLeafQueueState(LeafQueue queue) } @VisibleForTesting - public float getAbsoluteActivatedChildQueueCapacity() { - return parentQueueState.getAbsoluteActivatedChildQueueCapacity(); + public float getAbsoluteActivatedChildQueueCapacity(String nodeLabel) { + return parentQueueState.getAbsoluteActivatedChildQueueCapacity(nodeLabel); } private List getSortedPendingApplications() { @@ -721,19 +795,10 @@ public float getAbsoluteActivatedChildQueueCapacity() { } private AutoCreatedLeafQueueConfig buildTemplate( - float capacity, float maxCapacity) { + QueueCapacities capacities) { AutoCreatedLeafQueueConfig.Builder templateBuilder = new AutoCreatedLeafQueueConfig.Builder(); - - QueueCapacities capacities = new QueueCapacities(false); templateBuilder.capacities(capacities); - - for (String nodeLabel : parentQueue.getQueueCapacities() - .getExistingNodeLabels()) { - capacities.setCapacity(nodeLabel, capacity); - capacities.setMaximumCapacity(nodeLabel, maxCapacity); - } - return new AutoCreatedLeafQueueConfig(templateBuilder); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java index 24b45a8ff3b..530aa9324f8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerAutoQueueCreation.java @@ -71,8 +71,10 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -84,8 +86,11 @@ import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CSQueueUtils.EPSILON; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.DOT; + import static org.apache.hadoop.yarn.server.resourcemanager.scheduler .capacity.CapacitySchedulerConfiguration.FAIR_APP_ORDERING_POLICY; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler + .capacity.CapacitySchedulerConfiguration.ROOT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -140,6 +145,11 @@ private final String NODEL_LABEL_GPU = "GPU"; private final String NODEL_LABEL_SSD = "SSD"; + private final float NODE_LABEL_GPU_TEMPLATE_CAPACITY = 30.0f; + private final float NODE_LABEL_GPU_TEMPLATE_MAX_CAPACITY = 100.0f; + private final float NODEL_LABEL_SSD_TEMPLATE_CAPACITY = 40.0f; + private final float NODE_LABEL_SSD_TEMPLATE_MAX_CAPACITY = 100.0f; + private MockRM mockRM = null; private CapacityScheduler cs; @@ -275,6 +285,15 @@ private CapacitySchedulerConfiguration setupQueueConfiguration( conf.setAutoCreatedLeafQueueConfigUserLimit(C, 100); conf.setAutoCreatedLeafQueueConfigUserLimitFactor(C, 3.0f); + conf.setAutoCreatedLeafQueueTemplateCapacityByLabel(C, NODEL_LABEL_GPU, + NODE_LABEL_GPU_TEMPLATE_CAPACITY); + conf.setAutoCreatedLeafQueueTemplateMaxCapacity(C, NODEL_LABEL_GPU, 100.0f); + + conf.setAutoCreatedLeafQueueTemplateCapacityByLabel(C, NODEL_LABEL_SSD, + NODEL_LABEL_SSD_TEMPLATE_CAPACITY); + conf.setAutoCreatedLeafQueueTemplateMaxCapacity(C, NODEL_LABEL_SSD, + 100.0f); + LOG.info("Setup " + C + " as an auto leaf creation enabled parent queue"); conf.setUserLimitFactor(D, 1.0f); @@ -299,9 +318,13 @@ private CapacitySchedulerConfiguration setupQueueConfiguration( accessibleNodeLabelsOnC.add(NODEL_LABEL_SSD); accessibleNodeLabelsOnC.add(NO_LABEL); + conf.setAccessibleNodeLabels(ROOT, accessibleNodeLabelsOnC); + conf.setCapacityByLabel(ROOT, NODEL_LABEL_GPU, 100f); + conf.setCapacityByLabel(ROOT, NODEL_LABEL_SSD, 100f); + conf.setAccessibleNodeLabels(C, accessibleNodeLabelsOnC); - conf.setCapacityByLabel(C, NODEL_LABEL_GPU, 50); - conf.setCapacityByLabel(C, NODEL_LABEL_SSD, 50); + conf.setCapacityByLabel(C, NODEL_LABEL_GPU, 100f); + conf.setCapacityByLabel(C, NODEL_LABEL_SSD, 100f); LOG.info("Setup " + D + " as an auto leaf creation enabled parent queue"); @@ -315,7 +338,7 @@ public void tearDown() throws Exception { } } - @Test(timeout = 10000) + @Test public void testAutoCreateLeafQueueCreation() throws Exception { try { @@ -332,7 +355,11 @@ public void testAutoCreateLeafQueueCreation() throws Exception { ManagedParentQueue parentQueue = (ManagedParentQueue) cs.getQueue( PARENT_QUEUE); assertEquals(parentQueue, autoCreatedLeafQueue.getParent()); - validateInitialQueueEntitlement(parentQueue, USER0, 0.1f); + + Map expectedChildQueueAbsCapacity = + populateExpectedAbsCapacityByLabelForParentQueue(1); + validateInitialQueueEntitlement(parentQueue, USER0, + expectedChildQueueAbsCapacity); validateUserAndAppLimits(autoCreatedLeafQueue, 1000, 1000); assertTrue(autoCreatedLeafQueue.getOrderingPolicy() instanceof FairOrderingPolicy); @@ -341,6 +368,30 @@ public void testAutoCreateLeafQueueCreation() throws Exception { } } + private Map populateExpectedAbsCapacityByLabelForParentQueue + (int numLeafQueues) { + Map expectedChildQueueAbsCapacity = new HashMap<>(); + expectedChildQueueAbsCapacity.put(NODEL_LABEL_GPU, + NODE_LABEL_GPU_TEMPLATE_CAPACITY/100 * numLeafQueues); + expectedChildQueueAbsCapacity.put(NODEL_LABEL_SSD, + NODEL_LABEL_SSD_TEMPLATE_CAPACITY/100 * numLeafQueues); + expectedChildQueueAbsCapacity.put(NO_LABEL, 0.1f * numLeafQueues); + return expectedChildQueueAbsCapacity; + } + + private Map populateExpectedAbsCapacityByLabelForParentQueue + (int numLeafQueues, QueueCapacities queueCapacities) { + Map expectedChildQueueAbsCapacity = new HashMap<>(); + expectedChildQueueAbsCapacity.put(NODEL_LABEL_GPU, queueCapacities + .getAbsoluteCapacity(NODEL_LABEL_GPU) * + numLeafQueues); + expectedChildQueueAbsCapacity.put(NODEL_LABEL_SSD, queueCapacities + .getAbsoluteCapacity(NODEL_LABEL_SSD) * numLeafQueues); + expectedChildQueueAbsCapacity.put(NO_LABEL, queueCapacities + .getAbsoluteCapacity(NO_LABEL) * numLeafQueues); + return expectedChildQueueAbsCapacity; + } + @Test public void testReinitializeStoppedAutoCreatedLeafQueue() throws Exception { try { @@ -369,10 +420,17 @@ public void testReinitializeStoppedAutoCreatedLeafQueue() throws Exception { (AutoCreatedLeafQueue) cs.getQueue(USER0); ManagedParentQueue parentQueue = (ManagedParentQueue) cs.getQueue( PARENT_QUEUE); + assertEquals(parentQueue, user0Queue.getParent()); assertEquals(parentQueue, user1Queue.getParent()); - validateInitialQueueEntitlement(parentQueue, USER0, 0.2f); - validateInitialQueueEntitlement(parentQueue, USER1, 0.2f); + + Map + expectedAbsChildQueueCapacity = + populateExpectedAbsCapacityByLabelForParentQueue(2); + validateInitialQueueEntitlement(parentQueue, USER0, + expectedAbsChildQueueCapacity); + validateInitialQueueEntitlement(parentQueue, USER1, + expectedAbsChildQueueCapacity); ApplicationAttemptId appAttemptId = appsInC.get(0); @@ -380,7 +438,8 @@ public void testReinitializeStoppedAutoCreatedLeafQueue() throws Exception { RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory( null); ResourceRequest r1 = TestUtils.createResourceRequest(ResourceRequest.ANY, - 1 * GB, 1, true, priority, recordFactory); + 1 * GB, 1, true, priority, + recordFactory); cs.allocate(appAttemptId, Collections.singletonList(r1), Collections.emptyList(), Collections.singletonList(host), @@ -411,11 +470,6 @@ public void testReinitializeStoppedAutoCreatedLeafQueue() throws Exception { validateCapacities(user0QueueReinited, 0.0f, 0.0f, 0.0f, 0.0f); - AutoCreatedLeafQueue leafQueue = (AutoCreatedLeafQueue) cs.getQueue( - USER1); - validateInitialQueueEntitlement(parentQueue, leafQueue.getQueueName(), - 0.1f); - } finally { cleanupQueue(USER0); } @@ -532,8 +586,8 @@ public void testAutoCreateLeafQueueFailsWithNoQueueMapping() private void validateCapacities(AutoCreatedLeafQueue autoCreatedLeafQueue, float capacity, float absCapacity, float maxCapacity, float absMaxCapacity) { - assertEquals( capacity, autoCreatedLeafQueue.getCapacity(), EPSILON); - assertEquals( absCapacity, autoCreatedLeafQueue.getAbsoluteCapacity(), EPSILON); + assertEquals(capacity, autoCreatedLeafQueue.getCapacity(), EPSILON); + assertEquals(absCapacity, autoCreatedLeafQueue.getAbsoluteCapacity(), EPSILON); assertEquals(maxCapacity, autoCreatedLeafQueue.getMaximumCapacity(), EPSILON); assertEquals(absMaxCapacity, autoCreatedLeafQueue.getAbsoluteMaximumCapacity(), EPSILON); @@ -802,12 +856,19 @@ public void testAutoCreatedQueueActivationDeactivation() throws Exception { //submit app1 as USER1 submitApp(mockRM, parentQueue, USER1, USER1, 1, 1); - validateInitialQueueEntitlement(parentQueue, USER1, 0.1f); + Map expectedAbsChildQueueCapacity = + populateExpectedAbsCapacityByLabelForParentQueue(1); + validateInitialQueueEntitlement(parentQueue, USER1, + expectedAbsChildQueueCapacity); //submit another app2 as USER2 - ApplicationId user2AppId = submitApp(mockRM, parentQueue, USER2, USER2, 2, - 1); - validateInitialQueueEntitlement(parentQueue, USER2, 0.2f); + ApplicationId user2AppId = submitApp(mockRM, parentQueue, USER2, USER2, + 2, 1); + + expectedAbsChildQueueCapacity = + populateExpectedAbsCapacityByLabelForParentQueue(2); + validateInitialQueueEntitlement(parentQueue, USER2, + expectedAbsChildQueueCapacity); //submit another app3 as USER1 submitApp(mockRM, parentQueue, USER1, USER1, 3, 2); @@ -817,10 +878,15 @@ public void testAutoCreatedQueueActivationDeactivation() throws Exception { (GuaranteedOrZeroCapacityOverTimePolicy) ((ManagedParentQueue) parentQueue) .getAutoCreatedQueueManagementPolicy(); - assertEquals(autoCreatedQueueManagementPolicy - .getAbsoluteActivatedChildQueueCapacity(), 0.2f, EPSILON); - //submit user_3 app. This cant be scheduled since there is no capacity + for( String nodeLabel : accessibleNodeLabelsOnC) { + assertEquals(expectedAbsChildQueueCapacity.get(nodeLabel), + autoCreatedQueueManagementPolicy + .getAbsoluteActivatedChildQueueCapacity(nodeLabel), EPSILON); + } + + //submit user_3 app. This cant be allocated since there is no capacity + // in NO_LABEL, SSD but can be in GPU label submitApp(mockRM, parentQueue, USER3, USER3, 4, 1); final CSQueue user3LeafQueue = cs.getQueue(USER3); validateCapacities((AutoCreatedLeafQueue) user3LeafQueue, 0.0f, @@ -830,59 +896,48 @@ public void testAutoCreatedQueueActivationDeactivation() throws Exception { cs.killAllAppsInQueue(USER2); mockRM.waitForState(user2AppId, RMAppState.KILLED); - //Verify if USER_2 can be deactivated since it has no pending appsA + //Verify if USER_2 can be deactivated since it has no pending apps List queueManagementChanges = autoCreatedQueueManagementPolicy.computeQueueManagementChanges(); ManagedParentQueue managedParentQueue = (ManagedParentQueue) parentQueue; - managedParentQueue.validateAndApplyQueueManagementChanges(queueManagementChanges); - - validateDeactivatedQueueEntitlement(parentQueue, USER2, 0.2f, - queueManagementChanges); + managedParentQueue. + validateAndApplyQueueManagementChanges(queueManagementChanges); - //USER_3 should now get activated - validateActivatedQueueEntitlement(parentQueue, USER3, 0.2f, - queueManagementChanges); - - } finally { - cleanupQueue(USER1); - cleanupQueue(USER2); - cleanupQueue(USER3); - } - } + validateDeactivatedQueueEntitlement(parentQueue, USER2, + expectedAbsChildQueueCapacity, queueManagementChanges); - @Test - public void testAutoCreatedQueueInheritsNodeLabels() throws Exception { + //USER_3 should now get activated for SSD, NO_LABEL + expectedAbsChildQueueCapacity = + populateExpectedAbsCapacityByLabelForParentQueue(2); - try { - String host = "127.0.0.1"; - RMNode node = MockNodes.newNodeInfo(0, MockNodes.newResource(4 * GB), 1, - host); - cs.handle(new NodeAddedSchedulerEvent(node)); + Set expectedNodeLabelsUpdated = new HashSet<>(); + expectedNodeLabelsUpdated.add(NO_LABEL); + expectedNodeLabelsUpdated.add(NODEL_LABEL_SSD); - CSQueue parentQueue = cs.getQueue(PARENT_QUEUE); + validateActivatedQueueEntitlement(parentQueue, USER3, + expectedAbsChildQueueCapacity , queueManagementChanges, expectedNodeLabelsUpdated); - submitApp(USER1, USER1, NODEL_LABEL_GPU); - //submit app1 as USER1 - validateInitialQueueEntitlement(parentQueue, USER1, 0.1f); } finally { cleanupQueue(USER1); + cleanupQueue(USER2); + cleanupQueue(USER3); } } void validateInitialQueueEntitlement(CSQueue parentQueue, String - leafQueueName, float - expectedTotalChildQueueAbsCapacity) throws + leafQueueName, Map + expectedTotalChildQueueAbsCapacityByLabel) throws SchedulerDynamicEditException { validateInitialQueueEntitlement(cs, parentQueue, leafQueueName, - expectedTotalChildQueueAbsCapacity); + expectedTotalChildQueueAbsCapacityByLabel); } void validateInitialQueueEntitlement(CapacityScheduler capacityScheduler, CSQueue parentQueue, String - leafQueueName, float - expectedTotalChildQueueAbsCapacity) throws + leafQueueName, Map + expectedTotalChildQueueAbsCapacityByLabel) throws SchedulerDynamicEditException { ManagedParentQueue autoCreateEnabledParentQueue = (ManagedParentQueue) parentQueue; @@ -891,34 +946,35 @@ void validateInitialQueueEntitlement(CapacityScheduler capacityScheduler, (GuaranteedOrZeroCapacityOverTimePolicy) autoCreateEnabledParentQueue .getAutoCreatedQueueManagementPolicy(); - assertEquals(expectedTotalChildQueueAbsCapacity, - policy.getAbsoluteActivatedChildQueueCapacity(), EPSILON); - AutoCreatedLeafQueue leafQueue = (AutoCreatedLeafQueue) capacityScheduler.getQueue(leafQueueName); for (String label : accessibleNodeLabelsOnC) { validateCapacitiesByLabel(autoCreateEnabledParentQueue, leafQueue, label); - } + assertEquals(true, policy.isActive(leafQueue, label)); - assertEquals(true, policy.isActive(leafQueue)); + assertEquals(expectedTotalChildQueueAbsCapacityByLabel.get(label), + policy.getAbsoluteActivatedChildQueueCapacity(label), EPSILON); + } } void validateCapacitiesByLabel(ManagedParentQueue autoCreateEnabledParentQueue, AutoCreatedLeafQueue leafQueue, String label) { assertEquals(autoCreateEnabledParentQueue.getLeafQueueTemplate() - .getQueueCapacities().getCapacity(), + .getQueueCapacities().getCapacity(label), leafQueue.getQueueCapacities() .getCapacity(label), EPSILON); assertEquals(autoCreateEnabledParentQueue.getLeafQueueTemplate() - .getQueueCapacities().getMaximumCapacity(), + .getQueueCapacities().getMaximumCapacity(label), leafQueue.getQueueCapacities() .getMaximumCapacity(label), EPSILON); } void validateActivatedQueueEntitlement(CSQueue parentQueue, - String leafQueueName, float expectedTotalChildQueueAbsCapacity, - List queueManagementChanges) + String leafQueueName, Map + expectedTotalChildQueueAbsCapacity, + List queueManagementChanges, Set + expectedNodeLabels) throws SchedulerDynamicEditException { ManagedParentQueue autoCreateEnabledParentQueue = (ManagedParentQueue) parentQueue; @@ -929,28 +985,40 @@ void validateActivatedQueueEntitlement(CSQueue parentQueue, QueueCapacities cap = autoCreateEnabledParentQueue.getLeafQueueTemplate() .getQueueCapacities(); - QueueEntitlement expectedEntitlement = new QueueEntitlement( - cap.getCapacity(), cap.getMaximumCapacity()); - //validate capacity - validateQueueEntitlements(leafQueueName, expectedEntitlement, - queueManagementChanges); - //validate parent queue state - assertEquals(expectedTotalChildQueueAbsCapacity, - policy.getAbsoluteActivatedChildQueueCapacity(), EPSILON); + AutoCreatedLeafQueue leafQueue = (AutoCreatedLeafQueue) + cs.getQueue(leafQueueName); - AutoCreatedLeafQueue leafQueue = (AutoCreatedLeafQueue) cs.getQueue(leafQueueName); + Map expectedEntitlements = new HashMap<>(); - //validate leaf queue state - assertEquals(true, policy.isActive(leafQueue)); + for (String label : expectedNodeLabels) { + //validate leaf queue state + assertEquals(true, policy.isActive(leafQueue, label)); + + QueueEntitlement expectedEntitlement = new QueueEntitlement( + cap.getCapacity(label), cap.getMaximumCapacity(label)); + + //validate parent queue state + assertEquals(expectedTotalChildQueueAbsCapacity.get(label), + policy.getAbsoluteActivatedChildQueueCapacity(label), EPSILON); + + expectedEntitlements.put(label, expectedEntitlement); + } + + //validate capacity + validateQueueEntitlements(leafQueueName, expectedEntitlements, + queueManagementChanges, expectedNodeLabels); } void validateDeactivatedQueueEntitlement(CSQueue parentQueue, - String leafQueueName, float expectedTotalChildQueueAbsCapacity, List + String leafQueueName, Map + expectedTotalChildQueueAbsCapacity, + List queueManagementChanges) throws SchedulerDynamicEditException { - QueueEntitlement expectedEntitlement = new QueueEntitlement(0.0f, 1.0f); + QueueEntitlement expectedEntitlement = + new QueueEntitlement(0.0f, 1.0f); ManagedParentQueue autoCreateEnabledParentQueue = (ManagedParentQueue) parentQueue; @@ -962,25 +1030,32 @@ void validateDeactivatedQueueEntitlement(CSQueue parentQueue, (GuaranteedOrZeroCapacityOverTimePolicy) autoCreateEnabledParentQueue .getAutoCreatedQueueManagementPolicy(); - //validate parent queue state - assertEquals(expectedTotalChildQueueAbsCapacity, - policy.getAbsoluteActivatedChildQueueCapacity(), EPSILON); + Map expectedEntitlements = new HashMap<>(); - //validate leaf queue state - assertEquals(false, policy.isActive(leafQueue)); + for (String label : accessibleNodeLabelsOnC) { + //validate parent queue state + LOG.info("Validating label " + label); + assertEquals(expectedTotalChildQueueAbsCapacity.get(label), policy + .getAbsoluteActivatedChildQueueCapacity(label), EPSILON); + + //validate leaf queue state + assertEquals(false, policy.isActive(leafQueue, label)); + expectedEntitlements.put(label, expectedEntitlement); + } //validate capacity - validateQueueEntitlements(leafQueueName, expectedEntitlement, - queueManagementChanges); + validateQueueEntitlements(leafQueueName, expectedEntitlements, + queueManagementChanges, accessibleNodeLabelsOnC); } void validateQueueEntitlements(String leafQueueName, - QueueEntitlement expectedEntitlement, List - queueEntitlementChanges) { + Map expectedEntitlements, + List + queueEntitlementChanges, Set expectedNodeLabels) { AutoCreatedLeafQueue leafQueue = (AutoCreatedLeafQueue) cs.getQueue( leafQueueName); - validateQueueEntitlementChangesForLeafQueue(leafQueue, expectedEntitlement, - queueEntitlementChanges); + validateQueueEntitlementChangesForLeafQueue(leafQueue, expectedEntitlements, + queueEntitlementChanges, expectedNodeLabels); } String getQueueMapping(String parentQueue, String leafQueue) { @@ -988,8 +1063,9 @@ String getQueueMapping(String parentQueue, String leafQueue) { } private void validateQueueEntitlementChangesForLeafQueue(CSQueue leafQueue, - QueueEntitlement expectedQueueEntitlement, - final List queueEntitlementChanges) { + Map expectedQueueEntitlements, + final List queueEntitlementChanges, Set + expectedNodeLabels) { boolean found = false; for (QueueManagementChange entitlementChange : queueEntitlementChanges) { if (leafQueue.getQueueName().equals( @@ -998,12 +1074,12 @@ private void validateQueueEntitlementChangesForLeafQueue(CSQueue leafQueue, AutoCreatedLeafQueueConfig updatedQueueTemplate = entitlementChange.getUpdatedQueueTemplate(); - for (String label : accessibleNodeLabelsOnC) { + for (String label : expectedNodeLabels) { QueueEntitlement newEntitlement = new QueueEntitlement( updatedQueueTemplate.getQueueCapacities().getCapacity(label), updatedQueueTemplate.getQueueCapacities().getMaximumCapacity (label)); - assertEquals(expectedQueueEntitlement, newEntitlement); + assertEquals(expectedQueueEntitlements.get(label), newEntitlement); } found = true; break; @@ -1073,13 +1149,17 @@ public void testReinitializeQueuesWithAutoCreatedLeafQueues() throws //submit app1 as USER1 submitApp(newMockRM, parentQueue, USER1, USER1, 1, 1); - validateInitialQueueEntitlement(newCS, parentQueue, USER1, 0.1f); + Map expectedChildQueueAbsCapacity = + populateExpectedAbsCapacityByLabelForParentQueue(1); + validateInitialQueueEntitlement(newCS, parentQueue, USER1, expectedChildQueueAbsCapacity); //submit another app2 as USER2 ApplicationId user2AppId = submitApp(newMockRM, parentQueue, USER2, USER2, 2, 1); - validateInitialQueueEntitlement(newCS, parentQueue, USER2, 0.2f); + expectedChildQueueAbsCapacity = + populateExpectedAbsCapacityByLabelForParentQueue(2); + validateInitialQueueEntitlement(newCS, parentQueue, USER2, expectedChildQueueAbsCapacity); //update parent queue capacity conf.setCapacity(C, 30f); @@ -1104,7 +1184,7 @@ public void testReinitializeQueuesWithAutoCreatedLeafQueues() throws //submit app1 as USER3 submitApp(newMockRM, parentQueue, USER3, USER3, 3, 1); - validateInitialQueueEntitlement(newCS, parentQueue, USER3, 0.27f); + AutoCreatedLeafQueue user3Queue = (AutoCreatedLeafQueue) newCS.getQueue(USER1); validateCapacities(user3Queue, 0.3f, 0.09f, 0.4f,0.2f); @@ -1113,10 +1193,17 @@ public void testReinitializeQueuesWithAutoCreatedLeafQueues() throws //submit app1 as USER1 - is already activated. there should be no diff // in capacities submitApp(newMockRM, parentQueue, USER3, USER3, 4, 2); - validateInitialQueueEntitlement(newCS, parentQueue, USER3, 0.27f); validateCapacities(user3Queue, 0.3f, 0.09f, 0.4f,0.2f); validateUserAndAppLimits(user3Queue, 900, 900); + GuaranteedOrZeroCapacityOverTimePolicy autoCreatedQueueManagementPolicy = + (GuaranteedOrZeroCapacityOverTimePolicy) ((ManagedParentQueue) + parentQueue) + .getAutoCreatedQueueManagementPolicy(); + assertEquals(0.27f, autoCreatedQueueManagementPolicy + .getAbsoluteActivatedChildQueueCapacity + (NO_LABEL), EPSILON); + } finally { cleanupQueue(USER1); cleanupQueue(USER2);