diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java index 4cd5925f242..1534759914c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DefaultAMSProcessor.java @@ -223,21 +223,22 @@ public void allocate(ApplicationAttemptId appAttemptId, getRmContext().getRMApps().get(appAttemptId.getApplicationId()); // set label expression for Resource Requests if resourceName=ANY - ApplicationSubmissionContext asc = app.getApplicationSubmissionContext(); + ApplicationSubmissionContext submissionContext = + app.getApplicationSubmissionContext(); for (ResourceRequest req : ask) { if (null == req.getNodeLabelExpression() && ResourceRequest.ANY.equals(req.getResourceName())) { - req.setNodeLabelExpression(asc.getNodeLabelExpression()); + req.setNodeLabelExpression(submissionContext.getNodeLabelExpression()); } } - Resource maximumCapacity = getScheduler().getMaximumResourceCapability(); + Resource maximumAllocation = rmContext.getScheduler() + .getMaximumResourceCapability(submissionContext.getQueue()); // sanity check try { - RMServerUtils.normalizeAndValidateRequests(ask, - maximumCapacity, app.getQueue(), - getScheduler(), getRmContext()); + RMServerUtils.normalizeAndValidateRequests(ask, app.getQueue(), + getScheduler(), getRmContext(), maximumAllocation); } catch (InvalidResourceRequestException e) { RMAppAttempt rmAppAttempt = app.getRMAppAttempt(appAttemptId); handleInvalidResourceException(e, rmAppAttempt); @@ -252,8 +253,7 @@ public void allocate(ApplicationAttemptId appAttemptId, // In the case of work-preserving AM restart, it's possible for the // AM to release containers from the earlier attempt. - if (!app.getApplicationSubmissionContext() - .getKeepContainersAcrossApplicationAttempts()) { + if (!submissionContext.getKeepContainersAcrossApplicationAttempts()) { try { RMServerUtils.validateContainerReleaseRequest(release, appAttemptId); } catch (InvalidContainerReleaseException e) { @@ -269,7 +269,7 @@ public void allocate(ApplicationAttemptId appAttemptId, List updateErrors = new ArrayList<>(); ContainerUpdates containerUpdateRequests = RMServerUtils.validateAndSplitUpdateResourceRequests( - getRmContext(), request, maximumCapacity, updateErrors); + getRmContext(), request, maximumAllocation, updateErrors); // Send new requests to appAttempt. Allocation allocation; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java index ee78c083713..1c512f3795c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java @@ -38,6 +38,7 @@ import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest; import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.api.records.QueueACL; +import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.ResourceRequest; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.event.EventHandler; @@ -565,14 +566,17 @@ private RMAppImpl createAndPopulateNewRMApp( amReqs.add(0, anyReq); } + Resource maxAllocation = + scheduler.getMaximumResourceCapability(submissionContext.getQueue()); + // Normalize all requests for (ResourceRequest amReq : amReqs) { SchedulerUtils.normalizeAndValidateRequest(amReq, - scheduler.getMaximumResourceCapability(), - submissionContext.getQueue(), scheduler, isRecovery, rmContext); + submissionContext.getQueue(), scheduler, isRecovery, rmContext, + null, maxAllocation); - amReq.setCapability( - scheduler.getNormalizedResource(amReq.getCapability())); + amReq.setCapability(scheduler.getNormalizedResource( + amReq.getCapability(), maxAllocation)); } return amReqs; } catch (InvalidResourceRequestException e) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java index ab6bbcf3355..5c4c8e29032 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java @@ -97,7 +97,7 @@ "INCORRECT_CONTAINER_VERSION_ERROR"; private static final String INVALID_CONTAINER_ID = "INVALID_CONTAINER_ID"; - private static final String RESOURCE_OUTSIDE_ALLOWED_RANGE = + public static final String RESOURCE_OUTSIDE_ALLOWED_RANGE = "RESOURCE_OUTSIDE_ALLOWED_RANGE"; protected static final RecordFactory RECORD_FACTORY = @@ -134,15 +134,16 @@ } /** - * Check if we have: - * - Request for same containerId and different target resource. - * - If targetResources violates maximum/minimumAllocation. + * Check if we have: - Request for same containerId and different target + * resource. - If targetResources violates maximum/minimumAllocation. + * * @param rmContext RM context. * @param request Allocate Request. * @param maximumAllocation Maximum Allocation. * @param updateErrors Container update errors. * @return ContainerUpdateRequests. */ + public static ContainerUpdates validateAndSplitUpdateResourceRequests(RMContext rmContext, AllocateRequest request, Resource maximumAllocation, @@ -235,8 +236,8 @@ private static String validateContainerIdAndVersion( * requested memory/vcore is non-negative and not greater than max */ public static void normalizeAndValidateRequests(List ask, - Resource maximumResource, String queueName, YarnScheduler scheduler, - RMContext rmContext) throws InvalidResourceRequestException { + String queueName, YarnScheduler scheduler, RMContext rmContext, + Resource maximumAllocation) throws InvalidResourceRequestException { // Get queue from scheduler QueueInfo queueInfo = null; try { @@ -247,8 +248,8 @@ public static void normalizeAndValidateRequests(List ask, } for (ResourceRequest resReq : ask) { - SchedulerUtils.normalizeAndvalidateRequest(resReq, maximumResource, - queueName, scheduler, rmContext, queueInfo); + SchedulerUtils.normalizeAndvalidateRequest(resReq, queueName, scheduler, + rmContext, queueInfo, maximumAllocation); } } @@ -327,18 +328,18 @@ public static void validateBlacklistRequest( // Sanity check and normalize target resource private static boolean validateIncreaseDecreaseRequest(RMContext rmContext, UpdateContainerRequest request, Resource maximumAllocation) { - if (request.getCapability().getMemorySize() < 0 - || request.getCapability().getMemorySize() > maximumAllocation - .getMemorySize()) { + ResourceScheduler scheduler = rmContext.getScheduler(); + if (request.getCapability().getMemorySize() < 0 || request.getCapability() + .getMemorySize() > maximumAllocation.getMemorySize()) { return false; } - if (request.getCapability().getVirtualCores() < 0 - || request.getCapability().getVirtualCores() > maximumAllocation - .getVirtualCores()) { + if (request.getCapability().getVirtualCores() < 0 || request.getCapability() + .getVirtualCores() > maximumAllocation.getVirtualCores()) { return false; } - ResourceScheduler scheduler = rmContext.getScheduler(); - request.setCapability(scheduler.getNormalizedResource(request.getCapability())); + + request.setCapability(scheduler + .getNormalizedResource(request.getCapability(), maximumAllocation)); return true; } 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/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java index 9d2b0586dc8..ba74875f286 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java @@ -1159,11 +1159,12 @@ protected void nodeUpdate(RMNode nm) { } @Override - public Resource getNormalizedResource(Resource requestedResource) { + public Resource getNormalizedResource(Resource requestedResource, + Resource maxResourceCapability) { return SchedulerUtils.getNormalizedResource(requestedResource, getResourceCalculator(), getMinimumResourceCapability(), - getMaximumResourceCapability(), + maxResourceCapability, getMinimumResourceCapability()); } @@ -1173,8 +1174,20 @@ public Resource getNormalizedResource(Resource requestedResource) { * @param asks resource requests */ protected void normalizeResourceRequests(List asks) { - for (ResourceRequest ask: asks) { - ask.setCapability(getNormalizedResource(ask.getCapability())); + normalizeResourceRequests(asks, null); + } + + /** + * Normalize a list of resource requests + * using queue maximum resource allocations + * @param asks resource requests + */ + protected void normalizeResourceRequests(List asks, + String queueName) { + Resource maxAllocation = getMaximumResourceCapability(queueName); + for (ResourceRequest ask : asks) { + ask.setCapability( + getNormalizedResource(ask.getCapability(), maxAllocation)); } } 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/SchedulerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java index 9b07d37de52..f35fc619b60 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java @@ -114,19 +114,19 @@ public String toString() { public static final String UPDATED_CONTAINER = "Temporary container killed by application for ExeutionType update"; - - public static final String LOST_CONTAINER = + + public static final String LOST_CONTAINER = "Container released on a *lost* node"; - - public static final String PREEMPTED_CONTAINER = + + public static final String PREEMPTED_CONTAINER = "Container preempted by scheduler"; - - public static final String COMPLETED_APPLICATION = + + public static final String COMPLETED_APPLICATION = "Container of a completed application"; - + public static final String EXPIRED_CONTAINER = "Container expired since it was unused"; - + public static final String UNRESERVED_CONTAINER = "Container reservation no longer required."; @@ -141,7 +141,7 @@ public String toString() { */ public static ContainerStatus createAbnormalContainerStatus( ContainerId containerId, String diagnostics) { - return createAbnormalContainerStatus(containerId, + return createAbnormalContainerStatus(containerId, ContainerExitStatus.ABORTED, diagnostics); } @@ -169,14 +169,14 @@ public static ContainerStatus createKilledContainerStatus( */ public static ContainerStatus createPreemptedContainerStatus( ContainerId containerId, String diagnostics) { - return createAbnormalContainerStatus(containerId, + return createAbnormalContainerStatus(containerId, ContainerExitStatus.PREEMPTED, diagnostics); } /** * Utility to create a {@link ContainerStatus} during exceptional * circumstances. - * + * * @param containerId {@link ContainerId} of returned/released/lost container. * @param diagnostics diagnostic message * @return ContainerStatus for an returned/released/lost @@ -184,7 +184,7 @@ public static ContainerStatus createPreemptedContainerStatus( */ private static ContainerStatus createAbnormalContainerStatus( ContainerId containerId, int exitStatus, String diagnostics) { - ContainerStatus containerStatus = + ContainerStatus containerStatus = recordFactory.newRecordInstance(ContainerStatus.class); containerStatus.setContainerId(containerId); containerStatus.setDiagnostics(diagnostics); @@ -254,23 +254,14 @@ private static void normalizeNodeLabelExpressionInRequest( labelExp = RMNodeLabelsManager.NO_LABEL; } - if ( labelExp != null) { + if (labelExp != null) { resReq.setNodeLabelExpression(labelExp); } } public static void normalizeAndValidateRequest(ResourceRequest resReq, - Resource maximumResource, String queueName, YarnScheduler scheduler, - boolean isRecovery, RMContext rmContext) - throws InvalidResourceRequestException { - normalizeAndValidateRequest(resReq, maximumResource, queueName, scheduler, - isRecovery, rmContext, null); - } - - - private static void normalizeAndValidateRequest(ResourceRequest resReq, - Resource maximumResource, String queueName, YarnScheduler scheduler, - boolean isRecovery, RMContext rmContext, QueueInfo queueInfo) + String queueName, YarnScheduler scheduler, boolean isRecovery, + RMContext rmContext, QueueInfo queueInfo, Resource maximumAllocation) throws InvalidResourceRequestException { Configuration conf = rmContext.getYarnConfiguration(); // If Node label is not enabled throw exception @@ -299,37 +290,31 @@ private static void normalizeAndValidateRequest(ResourceRequest resReq, SchedulerUtils.normalizeNodeLabelExpressionInRequest(resReq, queueInfo); if (!isRecovery) { - validateResourceRequest(resReq, maximumResource, queueInfo, rmContext); + validateResourceRequest(resReq, queueInfo, rmContext, maximumAllocation); } } public static void normalizeAndvalidateRequest(ResourceRequest resReq, - Resource maximumResource, String queueName, YarnScheduler scheduler, - RMContext rmContext) throws InvalidResourceRequestException { - normalizeAndvalidateRequest(resReq, maximumResource, queueName, scheduler, - rmContext, null); - } - - public static void normalizeAndvalidateRequest(ResourceRequest resReq, - Resource maximumResource, String queueName, YarnScheduler scheduler, - RMContext rmContext, QueueInfo queueInfo) + String queueName, YarnScheduler scheduler, RMContext rmContext, + QueueInfo queueInfo, Resource maximumAllocation) throws InvalidResourceRequestException { - normalizeAndValidateRequest(resReq, maximumResource, queueName, scheduler, - false, rmContext, queueInfo); + normalizeAndValidateRequest(resReq, queueName, scheduler, + false, rmContext, queueInfo, maximumAllocation); } /** * Utility method to validate a resource request, by insuring that the * requested memory/vcore is non-negative and not greater than max - * + * * @throws InvalidResourceRequestException when there is invalid request */ private static void validateResourceRequest(ResourceRequest resReq, - Resource maximumResource, QueueInfo queueInfo, RMContext rmContext) + QueueInfo queueInfo, RMContext rmContext, Resource maximumAllocation) throws InvalidResourceRequestException { final Resource requestedResource = resReq.getCapability(); + checkResourceRequestAgainstAvailableResource(requestedResource, - maximumResource); + maximumAllocation); String labelExp = resReq.getNodeLabelExpression(); // we don't allow specify label expression other than resourceName=ANY now @@ -490,7 +475,7 @@ private static void throwInvalidResourceException(Resource reqResource, message = String.format(LESS_THAN_ZERO_RESOURCE_MESSAGE_TEMPLATE, reqResourceName, reqResource); } else if (invalidResourceType == - InvalidResourceType.GREATER_THEN_MAX_ALLOCATION) { + InvalidResourceType.GREATER_THEN_MAX_ALLOCATION) { message = String.format(GREATER_THAN_MAX_RESOURCE_MESSAGE_TEMPLATE, reqResourceName, reqResource, maxAllowedAllocation, ResourceUtils.getResourceTypesMaximumAllocation()); @@ -535,7 +520,7 @@ public static boolean checkQueueLabelExpression(Set queueLabels, if (!str.trim().isEmpty()) { // check queue label if (queueLabels == null) { - return false; + return false; } else { if (!queueLabels.contains(str) && !queueLabels.contains(RMNodeLabelsManager.ANY)) { 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/YarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java index 0f7a5b5b3ed..6fdbe90e62c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java @@ -390,12 +390,17 @@ public Priority updateApplicationPriority(Priority newPriority, SchedulerNode getSchedulerNode(NodeId nodeId); /** - * Normalize a resource request. + * Normalize a resource request using scheduler level maximum resource or + * queue based maximum resource * * @param requestedResource the resource to be normalized + * @param maxResourceCapability Maximum container allocation value, if null or + * empty scheduler level maximum container allocation value will be + * used * @return the normalized resource */ - Resource getNormalizedResource(Resource requestedResource); + Resource getNormalizedResource(Resource requestedResource, + Resource maxResourceCapability); /** * Verify whether a submitted application lifetime is valid as per configured 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/CapacityScheduler.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/CapacityScheduler.java index 81dcf86e038..59c75e69be3 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/CapacityScheduler.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/CapacityScheduler.java @@ -1157,10 +1157,12 @@ private void normalizeSchedulingRequests(List asks) { if (asks == null) { return; } + Resource maxAllocation = getMaximumResourceCapability(); for (SchedulingRequest ask: asks) { ResourceSizing sizing = ask.getResourceSizing(); if (sizing != null && sizing.getResources() != null) { - sizing.setResources(getNormalizedResource(sizing.getResources())); + sizing.setResources( + getNormalizedResource(sizing.getResources(), maxAllocation)); } } } @@ -2527,6 +2529,9 @@ private void checkQueuePartition(FiCaSchedulerApp app, LeafQueue dest) @Override public Resource getMaximumResourceCapability(String queueName) { + if(queueName == null || queueName.isEmpty()) { + return getMaximumResourceCapability(); + } CSQueue queue = getQueue(queueName); if (queue == null) { LOG.error("Unknown queue: " + 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/scheduler/constraint/processor/PlacementConstraintProcessor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/processor/PlacementConstraintProcessor.java index cf944a6213a..f687eb259c0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/processor/PlacementConstraintProcessor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/constraint/processor/PlacementConstraintProcessor.java @@ -175,11 +175,14 @@ public void allocate(ApplicationAttemptId appAttemptId, private void dispatchRequestsForPlacement(ApplicationAttemptId appAttemptId, List schedulingRequests) { if (schedulingRequests != null && !schedulingRequests.isEmpty()) { + String queueName = + scheduler.getApplicationAttempt(appAttemptId).getQueueName(); + Resource maxAllocation = scheduler.getMaximumResourceCapability(queueName); // Normalize the Requests before dispatching schedulingRequests.forEach(req -> { Resource reqResource = req.getResourceSizing().getResources(); - req.getResourceSizing() - .setResources(this.scheduler.getNormalizedResource(reqResource)); + req.getResourceSizing().setResources( + this.scheduler.getNormalizedResource(reqResource, maxAllocation)); }); this.placementDispatcher.dispatch(new BatchedRequests(iteratorType, appAttemptId.getApplicationId(), schedulingRequests, 1)); 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/fair/AllocationConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java index e48e04b486c..826d9f523eb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationConfiguration.java @@ -91,6 +91,9 @@ private final SchedulingPolicy defaultSchedulingPolicy; + //Map for maximum container resource allocation per queues by queue name + private final Map queueMaxContainerAllocationMap; + // Policy for mapping apps to queues @VisibleForTesting QueuePlacementPolicy placementPolicy; @@ -138,6 +141,8 @@ public AllocationConfiguration(QueueProperties queueProperties, this.placementPolicy = newPlacementPolicy; this.configuredQueues = queueProperties.getConfiguredQueues(); this.nonPreemptableQueues = queueProperties.getNonPreemptableQueues(); + this.queueMaxContainerAllocationMap = + queueProperties.getMaxContainerAllocation(); } public AllocationConfiguration(Configuration conf) { @@ -167,6 +172,7 @@ public AllocationConfiguration(Configuration conf) { placementPolicy = QueuePlacementPolicy.fromConfiguration(conf, configuredQueues); nonPreemptableQueues = new HashSet<>(); + queueMaxContainerAllocationMap = new HashMap<>(); } /** @@ -272,6 +278,12 @@ ConfigurableResource getMaxResources(String queue) { return maxQueueResource; } + @VisibleForTesting + Resource getQueueMaxContainerAllocation(String queue) { + Resource resource = queueMaxContainerAllocationMap.get(queue); + return resource == null ? Resources.unbounded() : resource; + } + /** * Get the maximum resource allocation for children of the given queue. * @@ -375,6 +387,7 @@ public void initFSQueue(FSQueue queue){ queue.setMaxRunningApps(getQueueMaxApps(name)); queue.setMaxAMShare(getQueueMaxAMShare(name)); queue.setMaxChildQueueResource(getMaxChildResources(name)); + queue.setMaxContainerAllocation(getQueueMaxContainerAllocation(name)); // Set queue metrics. queue.getMetrics().setMinShare(queue.getMinShare()); 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/fair/FSLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java index cbc74d25345..2a9a3bf0445 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java @@ -547,6 +547,15 @@ public void setWeights(float weight) { this.weights = weight; } + @Override + public Resource getMaximumContainerAllocation() { + if (maxContainerAllocation.equals(Resources.unbounded()) && getParent() != null) { + return getParent().getMaximumContainerAllocation(); + } else { + return maxContainerAllocation; + } + } + /** * Helper method to compute the amount of minshare starvation. * 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/fair/FSParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java index d5df549b282..45b33c23cc0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java @@ -59,7 +59,19 @@ public FSParentQueue(String name, FairScheduler scheduler, FSParentQueue parent) { super(name, scheduler, parent); } - + + @Override + public Resource getMaximumContainerAllocation() { + if (getName().equals("root")) { + return maxContainerAllocation; + } + if(maxContainerAllocation.equals(Resources.unbounded()) && getParent() != null) { + return getParent().getMaximumContainerAllocation(); + } else { + return maxContainerAllocation; + } + } + void addChildQueue(FSQueue child) { writeLock.lock(); try { 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/fair/FSQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java index 6b88a329fa3..0462b537cd0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java @@ -84,6 +84,7 @@ private float fairSharePreemptionThreshold = 0.5f; private boolean preemptable = true; private boolean isDynamic = true; + protected Resource maxContainerAllocation; public FSQueue(String name, FairScheduler scheduler, FSParentQueue parent) { this.name = name; @@ -163,6 +164,12 @@ public void setMaxShare(ConfigurableResource maxShare){ this.maxShare = maxShare; } + public void setMaxContainerAllocation(Resource maxContainerAllocation){ + this.maxContainerAllocation = maxContainerAllocation; + } + + public abstract Resource getMaximumContainerAllocation(); + @Override public Resource getMaxShare() { Resource maxResource = maxShare.getResource(scheduler.getClusterResource()); @@ -579,7 +586,6 @@ public String dumpState() { return sb.toString(); } - /** * Recursively dump states of all queues. * @@ -594,4 +600,5 @@ public boolean isDynamic() { public void setDynamic(boolean dynamic) { this.isDynamic = dynamic; } + } 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/fair/FairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java index 43a47ae65fe..da5e4c9347e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java @@ -192,6 +192,7 @@ protected long rackLocalityDelayMs; // Delay for rack locality protected boolean assignMultiple; // Allocate multiple containers per // heartbeat + @VisibleForTesting boolean maxAssignDynamic; protected int maxAssign; // Max containers to assign per heartbeat @@ -227,12 +228,12 @@ public boolean isAtLeastReservationThreshold( private void validateConf(FairSchedulerConfiguration config) { // validate scheduler memory allocation setting - int minMem = config.getInt( - YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, - YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB); - int maxMem = config.getInt( - YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, - YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB); + int minMem = + config.getInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, + YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB); + int maxMem = + config.getInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, + YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB); if (minMem < 0 || minMem > maxMem) { throw new YarnRuntimeException("Invalid resource scheduler memory" @@ -254,12 +255,12 @@ private void validateConf(FairSchedulerConfiguration config) { } // validate scheduler vcores allocation setting - int minVcores = config.getInt( - YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES, - YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES); - int maxVcores = config.getInt( - YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES, - YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES); + int minVcores = + config.getInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES, + YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES); + int maxVcores = + config.getInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES, + YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES); if (minVcores < 0 || minVcores > maxVcores) { throw new YarnRuntimeException("Invalid resource scheduler vcores" @@ -833,14 +834,35 @@ private void removeNode(RMNode rmNode) { } @Override - public Resource getNormalizedResource(Resource requestedResource) { + public Resource getNormalizedResource(Resource requestedResource, + Resource maxResourceCapability) { return SchedulerUtils.getNormalizedResource(requestedResource, DOMINANT_RESOURCE_CALCULATOR, minimumAllocation, - getMaximumResourceCapability(), + maxResourceCapability, incrAllocation); } + @Override + public Resource getMaximumResourceCapability(String queueName) { + if(queueName == null || queueName.isEmpty()) { + return getMaximumResourceCapability(); + } + FSQueue queue = queueMgr.getQueue(queueName); + Resource schedulerLevelMaxResourceCapability = + getMaximumResourceCapability(); + if (queue == null) { + return schedulerLevelMaxResourceCapability; + } + Resource queueMaxResourceCapability = queue.getMaximumContainerAllocation(); + if (queueMaxResourceCapability.equals(Resources.unbounded())) { + return schedulerLevelMaxResourceCapability; + } else { + return Resources.componentwiseMin(schedulerLevelMaxResourceCapability, + queueMaxResourceCapability); + } + } + @VisibleForTesting @Override public void killContainer(RMContainer container) { @@ -897,7 +919,7 @@ public Allocation allocate(ApplicationAttemptId appAttemptId, handleContainerUpdates(application, updateRequests); // Sanity check - normalizeResourceRequests(ask); + normalizeResourceRequests(ask, queue.getName()); // TODO, normalize SchedulingRequest 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/fair/allocation/AllocationFileQueueParser.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocation/AllocationFileQueueParser.java index 441c34a1aa1..854b9daf30b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocation/AllocationFileQueueParser.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocation/AllocationFileQueueParser.java @@ -51,6 +51,7 @@ private static final String MAX_CHILD_RESOURCES = "maxChildResources"; private static final String MAX_RUNNING_APPS = "maxRunningApps"; private static final String MAX_AMSHARE = "maxAMShare"; + public static final String MAX_CONTAINER_ALLOCATION = "maxContainerAllocation"; private static final String WEIGHT = "weight"; private static final String MIN_SHARE_PREEMPTION_TIMEOUT = "minSharePreemptionTimeout"; @@ -155,6 +156,11 @@ private void loadQueue(String parentName, Element element, float val = Float.parseFloat(text); val = Math.min(val, 1.0f); builder.queueMaxAMShares(queueName, val); + } else if (MAX_CONTAINER_ALLOCATION.equals(field.getTagName())) { + String text = getTrimmedTextData(field); + ConfigurableResource val = + FairSchedulerConfiguration.parseResourceConfigValue(text); + builder.queueMaxContainerAllocation(queueName, val.getResource()); } else if (WEIGHT.equals(field.getTagName())) { String text = getTrimmedTextData(field); double val = Double.parseDouble(text); 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/fair/allocation/QueueProperties.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocation/QueueProperties.java index ee5f1790237..35bff1543cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocation/QueueProperties.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocation/QueueProperties.java @@ -53,6 +53,7 @@ private final Set reservableQueues; private final Set nonPreemptableQueues; private final Map> configuredQueues; + private final Map queueMaxContainerAllocation; QueueProperties(Builder builder) { this.reservableQueues = builder.reservableQueues; @@ -70,6 +71,7 @@ this.maxChildQueueResources = builder.maxChildQueueResources; this.reservationAcls = builder.reservationAcls; this.queueAcls = builder.queueAcls; + this.queueMaxContainerAllocation = builder.queueMaxContainerAllocation; } public Map> getConfiguredQueues() { @@ -133,7 +135,11 @@ return nonPreemptableQueues; } - /** + public Map getMaxContainerAllocation() { + return queueMaxContainerAllocation; + } + + /** * Builder class for {@link QueueProperties}. * All methods are adding queue properties to the maps of this builder * keyed by the queue's name except some methods @@ -149,6 +155,7 @@ new HashMap<>(); private Map queueMaxApps = new HashMap<>(); private Map queueMaxAMShares = new HashMap<>(); + private Map queueMaxContainerAllocation = new HashMap<>(); private Map queueWeights = new HashMap<>(); private Map queuePolicies = new HashMap<>(); private Map minSharePreemptionTimeouts = new HashMap<>(); @@ -253,6 +260,11 @@ public Builder nonPreemptableQueues(String queue) { return this; } + public Builder queueMaxContainerAllocation(String queueName, Resource value) { + queueMaxContainerAllocation.put(queueName, value); + return this; + } + public void configuredQueues(FSQueueType queueType, String queueName) { this.configuredQueues.get(queueType).add(queueName); } @@ -275,6 +287,5 @@ public boolean isAclDefinedForAccessType(String queueName, public QueueProperties build() { return new QueueProperties(this); } - } } 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..b46b812b59e 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 @@ -78,6 +78,8 @@ protected void render(Block html) { __("Num Pending Applications:", qinfo.getNumPendingApplications()). __("Min Resources:", qinfo.getMinResources().toString()). __("Max Resources:", qinfo.getMaxResources().toString()). + __("Max Container Allocation:", + qinfo.getMaxContainerAllocation().toString()). __("Reserved Resources:", qinfo.getReservedResources().toString()); int maxApps = qinfo.getMaxApplications(); if (maxApps < Integer.MAX_VALUE) { @@ -107,6 +109,8 @@ protected void render(Block html) { __("Used Resources:", qinfo.getUsedResources().toString()). __("Min Resources:", qinfo.getMinResources().toString()). __("Max Resources:", qinfo.getMaxResources().toString()). + __("Max Container Resources:", + qinfo.getMaxContainerAllocation().toString()). __("Reserved Resources:", qinfo.getReservedResources().toString()); int maxApps = qinfo.getMaxApplications(); if (maxApps < Integer.MAX_VALUE) { 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 913513c52ae..f24275a16b4 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 @@ -60,6 +60,7 @@ private ResourceInfo fairResources; private ResourceInfo clusterResources; private ResourceInfo reservedResources; + private ResourceInfo maxContainerAllocation; private long allocatedContainers; private long reservedContainers; @@ -99,6 +100,7 @@ public FairSchedulerQueueInfo(FSQueue queue, FairScheduler scheduler) { maxResources = new ResourceInfo( Resources.componentwiseMin(queue.getMaxShare(), scheduler.getClusterResource())); + maxContainerAllocation = new ResourceInfo(scheduler.getMaximumResourceCapability(queueName)); reservedResources = new ResourceInfo(queue.getReservedResource()); fractionMemSteadyFairShare = @@ -186,7 +188,11 @@ public ResourceInfo getMinResources() { public ResourceInfo getMaxResources() { return maxResources; } - + + public ResourceInfo getMaxContainerAllocation() { + return maxContainerAllocation; + } + public ResourceInfo getReservedResources() { return reservedResources; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java index 2ad439189fd..ff7fc33d00d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java @@ -513,6 +513,14 @@ public RMApp submitApp(int masterMemory) throws Exception { return submitApp(masterMemory, false); } + public RMApp submitApp(int masterMemory, String queue) throws Exception { + return submitApp(masterMemory, "", + UserGroupInformation.getCurrentUser().getShortUserName(), null, false, + queue, super.getConfig().getInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, + YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS), + null); + } + public RMApp submitApp(int masterMemory, Set appTags) throws Exception { Resource resource = Resource.newInstance(masterMemory, 0); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java index 27e87bdcdda..bb8801d984f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java @@ -19,9 +19,26 @@ package org.apache.hadoop.yarn.server.resourcemanager; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.PREFIX; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.isA; +import static org.mockito.Matchers.matches; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyString; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentMap; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -68,7 +85,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptImpl; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; -import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.ManagedParentQueue; @@ -82,35 +98,12 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import java.io.IOException; -import java.lang.reflect.Field; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentMap; - -import static java.util.stream.Collectors.toSet; -import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.PREFIX; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.isA; -import static org.mockito.Matchers.matches; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; /** * Testing applications being retired from RM. @@ -234,74 +227,10 @@ public void handle(RMAppEvent event) { setAppEventType(event.getType()); System.out.println("in handle routine " + getAppEventType().toString()); } - } - - - // Extend and make the functions we want to test public - public class TestRMAppManager extends RMAppManager { - private final RMStateStore stateStore; - - public TestRMAppManager(RMContext context, Configuration conf) { - super(context, null, null, new ApplicationACLsManager(conf), conf); - this.stateStore = context.getStateStore(); - } - - public TestRMAppManager(RMContext context, - ClientToAMTokenSecretManagerInRM clientToAMSecretManager, - YarnScheduler scheduler, ApplicationMasterService masterService, - ApplicationACLsManager applicationACLsManager, Configuration conf) { - super(context, scheduler, masterService, applicationACLsManager, conf); - this.stateStore = context.getStateStore(); - } - - public void checkAppNumCompletedLimit() { - super.checkAppNumCompletedLimit(); - } - - public void finishApplication(ApplicationId appId) { - super.finishApplication(appId); - } - - public int getCompletedAppsListSize() { - return super.getCompletedAppsListSize(); - } - - public int getNumberOfCompletedAppsInStateStore() { - return this.completedAppsInStateStore; - } - - List getCompletedApps() { - return completedApps; - } - - Set getFirstNCompletedApps(int n) { - return getCompletedApps().stream().limit(n).collect(toSet()); - } - - Set getCompletedAppsWithEvenIdsInRange(int n) { - return getCompletedApps().stream().limit(n) - .filter(app -> app.getId() % 2 == 0).collect(toSet()); - } - - Set getRemovedAppsFromStateStore(int numRemoves) { - ArgumentCaptor argumentCaptor = - ArgumentCaptor.forClass(RMApp.class); - verify(stateStore, times(numRemoves)) - .removeApplication(argumentCaptor.capture()); - return argumentCaptor.getAllValues().stream().map(RMApp::getApplicationId) - .collect(toSet()); - } - - public void submitApplication( - ApplicationSubmissionContext submissionContext, String user) - throws YarnException, IOException { - super.submitApplication(submissionContext, System.currentTimeMillis(), - user); - } } private void addToCompletedApps(TestRMAppManager appMonitor, - RMContext rmContext) { + RMContext rmContext) { // ensure applications are finished in order by their IDs List sortedApps = new ArrayList<>(rmContext.getRMApps().values()); sortedApps.sort(Comparator.comparingInt(o -> o.getApplicationId().getId())); @@ -1210,17 +1139,21 @@ private static ResourceScheduler mockResourceScheduler() { Resources.createResource( YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB)); + when(scheduler.getMaximumResourceCapability(anyString())).thenReturn( + Resources.createResource( + YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB)); + ResourceCalculator rs = mock(ResourceCalculator.class); when(scheduler.getResourceCalculator()).thenReturn(rs); - when(scheduler.getNormalizedResource(any())) + when(scheduler.getNormalizedResource(any(), any())) .thenAnswer(new Answer() { - @Override - public Resource answer(InvocationOnMock invocationOnMock) - throws Throwable { - return (Resource) invocationOnMock.getArguments()[0]; - } - }); + @Override + public Resource answer(InvocationOnMock invocationOnMock) + throws Throwable { + return (Resource) invocationOnMock.getArguments()[0]; + } + }); return scheduler; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManagerWithFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManagerWithFairScheduler.java new file mode 100644 index 00000000000..ec549fd0a97 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManagerWithFairScheduler.java @@ -0,0 +1,158 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager; + +import org.apache.hadoop.yarn.MockApps; +import org.apache.hadoop.yarn.api.records.ApplicationAccessType; +import org.apache.hadoop.yarn.api.records.ApplicationId; +import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; +import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; +import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.api.records.QueueInfo; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.exceptions.InvalidResourceRequestException; +import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.factories.RecordFactory; +import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; +import org.apache.hadoop.yarn.server.resourcemanager.placement.ApplicationPlacementContext; +import org.apache.hadoop.yarn.server.resourcemanager.placement.PlacementManager; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.security.ClientToAMTokenSecretManagerInRM; +import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; +import org.apache.hadoop.yarn.util.resource.Resources; +import org.junit.Assert; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.HashMap; + +import static org.apache.hadoop.yarn.exceptions.InvalidResourceRequestException.InvalidResourceType.GREATER_THEN_MAX_ALLOCATION; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.matches; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; + +public class TestAppManagerWithFairScheduler { + + @Test + public void testQueueSubmitWithHighQueueContainerSize() throws IOException, YarnException { + + ApplicationId appId = MockApps.newAppID(1); + RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null); + + Resource resource = Resources.createResource( + YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB); + + ApplicationSubmissionContext asContext = + recordFactory.newRecordInstance(ApplicationSubmissionContext.class); + asContext.setApplicationId(appId); + asContext.setResource(resource); + asContext.setPriority(Priority.newInstance(0)); + asContext.setAMContainerSpec(mockContainerLaunchContext(recordFactory)); + asContext.setQueue("queueA"); + QueueInfo mockDefaultQueueInfo = mock(QueueInfo.class); + + String TEST_DIR = new File(System.getProperty("test.build.data", "/tmp")) + .getAbsolutePath(); + + String ALLOC_FILE = new File(TEST_DIR, "test-queues").getAbsolutePath(); + + int queueMaxAllocation = 512; + + PrintWriter out = new PrintWriter(new FileWriter(ALLOC_FILE)); + out.println(""); + out.println(""); + out.println(" "); + out.println(" " + queueMaxAllocation + + " mb 1 vcores" + ""); + out.println(" "); + out.println(" "); + out.println(" "); + out.println(""); + out.close(); + + YarnConfiguration conf = new YarnConfiguration(); + conf.setClass(YarnConfiguration.RM_SCHEDULER, FairScheduler.class, + ResourceScheduler.class); + + conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE); + + // Setup a PlacementManager returns a new queue + PlacementManager placementMgr = mock(PlacementManager.class); + doAnswer(new Answer() { + + @Override + public ApplicationPlacementContext answer(InvocationOnMock invocation) + throws Throwable { + return new ApplicationPlacementContext("queueA"); + } + + }).when(placementMgr).placeApplication( + any(ApplicationSubmissionContext.class), matches("test1")); + doAnswer(new Answer() { + + @Override + public ApplicationPlacementContext answer(InvocationOnMock invocation) + throws Throwable { + return new ApplicationPlacementContext("queueB"); + } + + }).when(placementMgr).placeApplication( + any(ApplicationSubmissionContext.class), matches("test2")); + + MockRM newMockRM = new MockRM(conf); + RMContext newMockRMContext = newMockRM.getRMContext(); + newMockRMContext.setQueuePlacementManager(placementMgr); + ApplicationMasterService masterService = new ApplicationMasterService( + newMockRMContext, newMockRMContext.getScheduler()); + + TestRMAppManager newAppMonitor = new TestRMAppManager(newMockRMContext, + new ClientToAMTokenSecretManagerInRM(), newMockRMContext.getScheduler(), + masterService, new ApplicationACLsManager(conf), conf); + + // only user test has permission to submit to 'test' queue + + try { + newAppMonitor.submitApplication(asContext, "test1"); + Assert.fail("Test should fail on too high allocation!"); + } catch (InvalidResourceRequestException e) { + Assert.assertEquals(GREATER_THEN_MAX_ALLOCATION, + e.getInvalidResourceType()); + } + + // Should not throw exception + newAppMonitor.submitApplication(asContext, "test2"); + } + + private static ContainerLaunchContext mockContainerLaunchContext( + RecordFactory recordFactory) { + ContainerLaunchContext amContainer = recordFactory.newRecordInstance( + ContainerLaunchContext.class); + amContainer.setApplicationACLs(new HashMap());; + return amContainer; + } +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java index 562ba5d5062..0c402892040 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java @@ -25,7 +25,10 @@ import static org.junit.Assert.fail; +import java.io.File; +import java.io.FileWriter; import java.io.IOException; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -39,6 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.yarn.ams.ApplicationMasterServiceContext; import org.apache.hadoop.yarn.ams.ApplicationMasterServiceProcessor; import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java index 6644e44453d..50ecf38ad96 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java @@ -351,9 +351,9 @@ public void testNonExistingApplicationReport() throws YarnException { @Test public void testGetApplicationReport() throws Exception { - YarnScheduler yarnScheduler = mock(YarnScheduler.class); + ResourceScheduler scheduler = mock(ResourceScheduler.class); RMContext rmContext = mock(RMContext.class); - mockRMContext(yarnScheduler, rmContext); + mockRMContext(scheduler, rmContext); ApplicationId appId1 = getApplicationId(1); @@ -362,7 +362,7 @@ public void testGetApplicationReport() throws Exception { mockAclsManager.checkAccess(UserGroupInformation.getCurrentUser(), ApplicationAccessType.VIEW_APP, null, appId1)).thenReturn(true); - ClientRMService rmService = new ClientRMService(rmContext, yarnScheduler, + ClientRMService rmService = new ClientRMService(rmContext, scheduler, null, mockAclsManager, null, null); try { RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null); @@ -445,9 +445,9 @@ public void testGetApplicationAttemptReport() throws YarnException, public void testGetApplicationResourceUsageReportDummy() throws YarnException, IOException { ApplicationAttemptId attemptId = getApplicationAttemptId(1); - YarnScheduler yarnScheduler = mockYarnScheduler(); + ResourceScheduler scheduler = mockResourceScheduler(); RMContext rmContext = mock(RMContext.class); - mockRMContext(yarnScheduler, rmContext); + mockRMContext(scheduler, rmContext); when(rmContext.getDispatcher().getEventHandler()).thenReturn( new EventHandler() { public void handle(Event event) { @@ -457,7 +457,7 @@ public void handle(Event event) { mock(ApplicationSubmissionContext.class); YarnConfiguration config = new YarnConfiguration(); RMAppAttemptImpl rmAppAttemptImpl = new RMAppAttemptImpl(attemptId, - rmContext, yarnScheduler, null, asContext, config, null, null); + rmContext, scheduler, null, asContext, config, null, null); ApplicationResourceUsageReport report = rmAppAttemptImpl .getApplicationResourceUsageReport(); assertEquals(report, RMServerUtils.DUMMY_APPLICATION_RESOURCE_USAGE_REPORT); @@ -526,14 +526,14 @@ public void testGetContainers() throws YarnException, IOException { } public ClientRMService createRMService() throws IOException, YarnException { - YarnScheduler yarnScheduler = mockYarnScheduler(); + ResourceScheduler scheduler = mockResourceScheduler(); RMContext rmContext = mock(RMContext.class); - mockRMContext(yarnScheduler, rmContext); + mockRMContext(scheduler, rmContext); ConcurrentHashMap apps = getRMApps(rmContext, - yarnScheduler); + scheduler); when(rmContext.getRMApps()).thenReturn(apps); when(rmContext.getYarnConfiguration()).thenReturn(new Configuration()); - RMAppManager appManager = new RMAppManager(rmContext, yarnScheduler, null, + RMAppManager appManager = new RMAppManager(rmContext, scheduler, null, mock(ApplicationACLsManager.class), new Configuration()); when(rmContext.getDispatcher().getEventHandler()).thenReturn( new EventHandler() { @@ -547,7 +547,7 @@ public void handle(Event event) { mockQueueACLsManager.checkAccess(any(UserGroupInformation.class), any(QueueACL.class), any(RMApp.class), any(String.class), any())).thenReturn(true); - return new ClientRMService(rmContext, yarnScheduler, appManager, + return new ClientRMService(rmContext, scheduler, appManager, mockAclsManager, mockQueueACLsManager, null); } @@ -896,9 +896,9 @@ private QueueACLsManager getQueueAclManager() { @Test public void testGetQueueInfo() throws Exception { - YarnScheduler yarnScheduler = mock(YarnScheduler.class); + ResourceScheduler scheduler = mock(ResourceScheduler.class); RMContext rmContext = mock(RMContext.class); - mockRMContext(yarnScheduler, rmContext); + mockRMContext(scheduler, rmContext); ApplicationACLsManager mockAclsManager = mock(ApplicationACLsManager.class); QueueACLsManager mockQueueACLsManager = mock(QueueACLsManager.class); @@ -910,7 +910,7 @@ public void testGetQueueInfo() throws Exception { any(ApplicationAccessType.class), anyString(), any(ApplicationId.class))).thenReturn(true); - ClientRMService rmService = new ClientRMService(rmContext, yarnScheduler, + ClientRMService rmService = new ClientRMService(rmContext, scheduler, null, mockAclsManager, mockQueueACLsManager, null); GetQueueInfoRequest request = recordFactory .newRecordInstance(GetQueueInfoRequest.class); @@ -949,7 +949,7 @@ public void testGetQueueInfo() throws Exception { any(ApplicationAccessType.class), anyString(), any(ApplicationId.class))).thenReturn(false); - ClientRMService rmService1 = new ClientRMService(rmContext, yarnScheduler, + ClientRMService rmService1 = new ClientRMService(rmContext, scheduler, null, mockAclsManager1, mockQueueACLsManager1, null); request.setQueueName("testqueue"); request.setIncludeApplications(true); @@ -963,12 +963,12 @@ public void testGetQueueInfo() throws Exception { @Test (timeout = 30000) @SuppressWarnings ("rawtypes") public void testAppSubmit() throws Exception { - YarnScheduler yarnScheduler = mockYarnScheduler(); + ResourceScheduler scheduler = mockResourceScheduler(); RMContext rmContext = mock(RMContext.class); - mockRMContext(yarnScheduler, rmContext); + mockRMContext(scheduler, rmContext); RMStateStore stateStore = mock(RMStateStore.class); when(rmContext.getStateStore()).thenReturn(stateStore); - RMAppManager appManager = new RMAppManager(rmContext, yarnScheduler, + RMAppManager appManager = new RMAppManager(rmContext, scheduler, null, mock(ApplicationACLsManager.class), new Configuration()); when(rmContext.getDispatcher().getEventHandler()).thenReturn( new EventHandler() { @@ -990,7 +990,7 @@ public void handle(Event event) {} any())) .thenReturn(true); ClientRMService rmService = - new ClientRMService(rmContext, yarnScheduler, appManager, + new ClientRMService(rmContext, scheduler, appManager, mockAclsManager, mockQueueACLsManager, null); rmService.init(new Configuration()); @@ -1074,15 +1074,15 @@ public void testGetApplications() throws Exception { * 2. Test each of the filters */ // Basic setup - YarnScheduler yarnScheduler = mockYarnScheduler(); + ResourceScheduler scheduler = mockResourceScheduler(); RMContext rmContext = mock(RMContext.class); - mockRMContext(yarnScheduler, rmContext); + mockRMContext(scheduler, rmContext); RMStateStore stateStore = mock(RMStateStore.class); when(rmContext.getStateStore()).thenReturn(stateStore); doReturn(mock(RMTimelineCollectorManager.class)).when(rmContext) .getRMTimelineCollectorManager(); - RMAppManager appManager = new RMAppManager(rmContext, yarnScheduler, + RMAppManager appManager = new RMAppManager(rmContext, scheduler, null, mock(ApplicationACLsManager.class), new Configuration()); when(rmContext.getDispatcher().getEventHandler()).thenReturn( new EventHandler() { @@ -1096,7 +1096,7 @@ public void handle(Event event) {} any())) .thenReturn(true); ClientRMService rmService = - new ClientRMService(rmContext, yarnScheduler, appManager, + new ClientRMService(rmContext, scheduler, appManager, mockAclsManager, mockQueueACLsManager, null); rmService.init(new Configuration()); @@ -1227,12 +1227,12 @@ public void handle(Event event) {} public void testConcurrentAppSubmit() throws IOException, InterruptedException, BrokenBarrierException, YarnException { - YarnScheduler yarnScheduler = mockYarnScheduler(); + ResourceScheduler scheduler = mockResourceScheduler(); RMContext rmContext = mock(RMContext.class); - mockRMContext(yarnScheduler, rmContext); + mockRMContext(scheduler, rmContext); RMStateStore stateStore = mock(RMStateStore.class); when(rmContext.getStateStore()).thenReturn(stateStore); - RMAppManager appManager = new RMAppManager(rmContext, yarnScheduler, + RMAppManager appManager = new RMAppManager(rmContext, scheduler, null, mock(ApplicationACLsManager.class), new Configuration()); final ApplicationId appId1 = getApplicationId(100); @@ -1269,7 +1269,7 @@ public void handle(Event rawEvent) { .getRMTimelineCollectorManager(); final ClientRMService rmService = - new ClientRMService(rmContext, yarnScheduler, appManager, null, null, + new ClientRMService(rmContext, scheduler, appManager, null, null, null); rmService.init(new Configuration()); @@ -1328,7 +1328,7 @@ private SubmitApplicationRequest mockSubmitAppRequest(ApplicationId appId, return submitRequest; } - private void mockRMContext(YarnScheduler yarnScheduler, RMContext rmContext) + private void mockRMContext(ResourceScheduler scheduler, RMContext rmContext) throws IOException { Dispatcher dispatcher = mock(Dispatcher.class); when(rmContext.getDispatcher()).thenReturn(dispatcher); @@ -1350,9 +1350,9 @@ private void mockRMContext(YarnScheduler yarnScheduler, RMContext rmContext) queueConfigsByPartition.put("*", queueConfigs); queInfo.setQueueConfigurations(queueConfigsByPartition); - when(yarnScheduler.getQueueInfo(eq("testqueue"), anyBoolean(), anyBoolean())) + when(scheduler.getQueueInfo(eq("testqueue"), anyBoolean(), anyBoolean())) .thenReturn(queInfo); - when(yarnScheduler.getQueueInfo(eq("nonexistentqueue"), anyBoolean(), anyBoolean())) + when(scheduler.getQueueInfo(eq("nonexistentqueue"), anyBoolean(), anyBoolean())) .thenThrow(new IOException("queue does not exist")); RMApplicationHistoryWriter writer = mock(RMApplicationHistoryWriter.class); when(rmContext.getRMApplicationHistoryWriter()).thenReturn(writer); @@ -1360,12 +1360,11 @@ private void mockRMContext(YarnScheduler yarnScheduler, RMContext rmContext) when(rmContext.getSystemMetricsPublisher()).thenReturn(publisher); when(rmContext.getYarnConfiguration()).thenReturn(new YarnConfiguration()); ConcurrentHashMap apps = getRMApps(rmContext, - yarnScheduler); + scheduler); when(rmContext.getRMApps()).thenReturn(apps); - when(yarnScheduler.getAppsInQueue(eq("testqueue"))).thenReturn( + when(scheduler.getAppsInQueue(eq("testqueue"))).thenReturn( getSchedulerApps(apps)); - ResourceScheduler rs = mock(ResourceScheduler.class); - when(rmContext.getScheduler()).thenReturn(rs); + when(rmContext.getScheduler()).thenReturn(scheduler); } private ConcurrentHashMap getRMApps( @@ -1469,28 +1468,31 @@ public ApplicationReport createAndGetApplicationReport( return app; } - private static YarnScheduler mockYarnScheduler() throws YarnException { - YarnScheduler yarnScheduler = mock(YarnScheduler.class); - when(yarnScheduler.getMinimumResourceCapability()).thenReturn( + private static ResourceScheduler mockResourceScheduler() throws YarnException { + ResourceScheduler scheduler = mock(ResourceScheduler.class); + when(scheduler.getMinimumResourceCapability()).thenReturn( Resources.createResource( YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB)); - when(yarnScheduler.getMaximumResourceCapability()).thenReturn( + when(scheduler.getMaximumResourceCapability()).thenReturn( Resources.createResource( YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB)); - when(yarnScheduler.getAppsInQueue(QUEUE_1)).thenReturn( + when(scheduler.getMaximumResourceCapability(anyString())).thenReturn( + Resources.createResource( + YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB)); + when(scheduler.getAppsInQueue(QUEUE_1)).thenReturn( Arrays.asList(getApplicationAttemptId(101), getApplicationAttemptId(102))); - when(yarnScheduler.getAppsInQueue(QUEUE_2)).thenReturn( + when(scheduler.getAppsInQueue(QUEUE_2)).thenReturn( Arrays.asList(getApplicationAttemptId(103))); ApplicationAttemptId attemptId = getApplicationAttemptId(1); - when(yarnScheduler.getAppResourceUsageReport(attemptId)).thenReturn(null); + when(scheduler.getAppResourceUsageReport(attemptId)).thenReturn(null); ResourceCalculator rs = mock(ResourceCalculator.class); - when(yarnScheduler.getResourceCalculator()).thenReturn(rs); + when(scheduler.getResourceCalculator()).thenReturn(rs); - when(yarnScheduler.checkAndGetApplicationPriority(any(Priority.class), + when(scheduler.checkAndGetApplicationPriority(any(Priority.class), any(UserGroupInformation.class), anyString(), any(ApplicationId.class))) .thenReturn(Priority.newInstance(0)); - return yarnScheduler; + return scheduler; } private ResourceManager setupResourceManager() { @@ -2187,15 +2189,15 @@ public void testGetApplicationsWithPerUserApps() * Submit 3 applications alternately in two queues */ // Basic setup - YarnScheduler yarnScheduler = mockYarnScheduler(); + ResourceScheduler scheduler = mockResourceScheduler(); RMContext rmContext = mock(RMContext.class); - mockRMContext(yarnScheduler, rmContext); + mockRMContext(scheduler, rmContext); RMStateStore stateStore = mock(RMStateStore.class); when(rmContext.getStateStore()).thenReturn(stateStore); doReturn(mock(RMTimelineCollectorManager.class)).when(rmContext) .getRMTimelineCollectorManager(); - RMAppManager appManager = new RMAppManager(rmContext, yarnScheduler, null, + RMAppManager appManager = new RMAppManager(rmContext, scheduler, null, mock(ApplicationACLsManager.class), new Configuration()); when(rmContext.getDispatcher().getEventHandler()) .thenReturn(new EventHandler() { @@ -2214,7 +2216,7 @@ public void handle(Event event) { when(appAclsManager.checkAccess(eq(UserGroupInformation.getCurrentUser()), any(ApplicationAccessType.class), any(String.class), any(ApplicationId.class))).thenReturn(false); - ClientRMService rmService = new ClientRMService(rmContext, yarnScheduler, + ClientRMService rmService = new ClientRMService(rmContext, scheduler, appManager, appAclsManager, queueAclsManager, null); rmService.init(new Configuration()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAppManager.java new file mode 100644 index 00000000000..a9ca1d2e8a8 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAppManager.java @@ -0,0 +1,101 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.yarn.api.records.ApplicationId; +import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; +import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.server.resourcemanager.ApplicationMasterService; +import org.apache.hadoop.yarn.server.resourcemanager.RMAppManager; +import org.apache.hadoop.yarn.server.resourcemanager.RMContext; +import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.security.ClientToAMTokenSecretManagerInRM; +import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; +import org.mockito.ArgumentCaptor; + +import java.util.List; +import java.util.Set; + +import static java.util.stream.Collectors.toSet; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +// Extend and make the functions we want to test public +public class TestRMAppManager extends RMAppManager { + private final RMStateStore stateStore; + + public TestRMAppManager(RMContext context, Configuration conf) { + super(context, null, null, new ApplicationACLsManager(conf), conf); + this.stateStore = context.getStateStore(); + } + + public TestRMAppManager(RMContext context, + ClientToAMTokenSecretManagerInRM clientToAMSecretManager, + YarnScheduler scheduler, ApplicationMasterService masterService, + ApplicationACLsManager applicationACLsManager, Configuration conf) { + super(context, scheduler, masterService, applicationACLsManager, conf); + this.stateStore = context.getStateStore(); + } + + public void checkAppNumCompletedLimit() { + super.checkAppNumCompletedLimit(); + } + + public void finishApplication(ApplicationId appId) { + super.finishApplication(appId); + } + + public int getCompletedAppsListSize() { + return super.getCompletedAppsListSize(); + } + + public int getNumberOfCompletedAppsInStateStore() { + return this.completedAppsInStateStore; + } + + public List getCompletedApps() { + return completedApps; + } + + public Set getFirstNCompletedApps(int n) { + return getCompletedApps().stream().limit(n).collect(toSet()); + } + + public Set getCompletedAppsWithEvenIdsInRange(int n) { + return getCompletedApps().stream().limit(n) + .filter(app -> app.getId() % 2 == 0).collect(toSet()); + } + + public Set getRemovedAppsFromStateStore(int numRemoves) { + ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(RMApp.class); + verify(stateStore, times(numRemoves)) + .removeApplication(argumentCaptor.capture()); + return argumentCaptor.getAllValues().stream().map(RMApp::getApplicationId) + .collect(toSet()); + } + + public void submitApplication(ApplicationSubmissionContext submissionContext, + String user) throws YarnException { + super.submitApplication(submissionContext, System.currentTimeMillis(), + user); + } +} \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMServerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMServerUtils.java index 078b8fd3290..8693a039bf5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMServerUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMServerUtils.java @@ -18,12 +18,23 @@ package org.apache.hadoop.yarn.server.resourcemanager; +import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest; +import org.apache.hadoop.yarn.api.records.Container; +import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.ResourceRequest; +import org.apache.hadoop.yarn.api.records.UpdateContainerError; +import org.apache.hadoop.yarn.api.records.UpdateContainerRequest; +import org.apache.hadoop.yarn.api.records.impl.pb.ContainerIdPBImpl; +import org.apache.hadoop.yarn.api.records.impl.pb.UpdateContainerRequestPBImpl; import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.event.Dispatcher; import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerImpl; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ContainerUpdates; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.junit.Assert; import org.junit.Test; @@ -37,7 +48,82 @@ import java.util.Map; import java.util.Set; +import static org.apache.hadoop.yarn.api.records.ContainerUpdateType.INCREASE_RESOURCE; +import static org.apache.hadoop.yarn.server.resourcemanager.RMServerUtils.RESOURCE_OUTSIDE_ALLOWED_RANGE; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class TestRMServerUtils { + + @Test + public void testValidateAndSplitUpdateResourceRequests() { + List updateRequests = new ArrayList<>(); + int containerVersion = 10; + int resource = 10; + Resource maxAllocation = Resource.newInstance(resource, resource); + + UpdateContainerRequestPBImpl updateContainerRequestPBFail = + new UpdateContainerRequestPBImpl(); + updateContainerRequestPBFail.setContainerVersion(containerVersion); + updateContainerRequestPBFail + .setCapability(Resource.newInstance(resource + 1, resource + 1)); + updateContainerRequestPBFail.setContainerId(mock(ContainerId.class)); + + ContainerId containerIdOk = mock(ContainerId.class); + Resource capabilityOk = Resource.newInstance(resource - 1, resource - 1); + UpdateContainerRequestPBImpl updateContainerRequestPBOk = + new UpdateContainerRequestPBImpl(); + updateContainerRequestPBOk.setContainerVersion(containerVersion); + updateContainerRequestPBOk.setCapability(capabilityOk); + updateContainerRequestPBOk.setContainerUpdateType(INCREASE_RESOURCE); + updateContainerRequestPBOk.setContainerId(containerIdOk); + + updateRequests.add(updateContainerRequestPBOk); + updateRequests.add(updateContainerRequestPBFail); + + Dispatcher dispatcher = mock(Dispatcher.class); + RMContext rmContext = mock(RMContext.class); + ResourceScheduler scheduler = mock(ResourceScheduler.class); + + when(rmContext.getScheduler()).thenReturn(scheduler); + when(rmContext.getDispatcher()).thenReturn(dispatcher); + + RMContainer rmContainer = mock(RMContainer.class); + Mockito.when(scheduler.getRMContainer(Mockito.any())) + .thenReturn(rmContainer); + Container container = mock(Container.class); + when(container.getVersion()).thenReturn(containerVersion); + when(rmContainer.getContainer()).thenReturn(container); + when(scheduler.getNormalizedResource(capabilityOk, maxAllocation)) + .thenReturn(capabilityOk); + + AllocateRequest allocateRequest = + AllocateRequest.newInstance(1, 0.5f, new ArrayList(), + new ArrayList(), updateRequests, null); + + List updateErrors = new ArrayList<>(); + ContainerUpdates containerUpdates = + RMServerUtils.validateAndSplitUpdateResourceRequests(rmContext, + allocateRequest, maxAllocation, updateErrors); + assertEquals(1, updateErrors.size()); + assertEquals(resource + 1, updateErrors.get(0).getUpdateContainerRequest() + .getCapability().getMemorySize()); + assertEquals(resource + 1, updateErrors.get(0).getUpdateContainerRequest() + .getCapability().getVirtualCores()); + assertEquals(RESOURCE_OUTSIDE_ALLOWED_RANGE, + updateErrors.get(0).getReason()); + + assertEquals(1, containerUpdates.getIncreaseRequests().size()); + UpdateContainerRequest increaseRequest = + containerUpdates.getIncreaseRequests().get(0); + assertEquals(capabilityOk.getVirtualCores(), + increaseRequest.getCapability().getVirtualCores()); + assertEquals(capabilityOk.getMemorySize(), + increaseRequest.getCapability().getMemorySize()); + assertEquals(containerIdOk, increaseRequest.getContainerId()); + } + @Test public void testGetApplicableNodeCountForAMLocality() throws Exception { List rack1Nodes = new ArrayList<>(); @@ -50,60 +136,60 @@ public void testGetApplicableNodeCountForAMLocality() throws Exception { YarnConfiguration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.NODE_LABELS_ENABLED, false); - ResourceScheduler scheduler = Mockito.mock(ResourceScheduler.class); + ResourceScheduler scheduler = mock(ResourceScheduler.class); Mockito.when(scheduler.getNumClusterNodes()).thenReturn(100); Mockito.when(scheduler.getNodeIds("/rack1")).thenReturn(rack1Nodes); Mockito.when(scheduler.getNodeIds("node1")) .thenReturn(Collections.singletonList(node1)); Mockito.when(scheduler.getNodeIds("node2")) .thenReturn(Collections.singletonList(node2)); - RMContext rmContext = Mockito.mock(RMContext.class); + RMContext rmContext = mock(RMContext.class); Mockito.when(rmContext.getScheduler()).thenReturn(scheduler); ResourceRequest anyReq = createResourceRequest(ResourceRequest.ANY, true, null); List reqs = new ArrayList<>(); reqs.add(anyReq); - Assert.assertEquals(100, + assertEquals(100, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); ResourceRequest rackReq = createResourceRequest("/rack1", true, null); reqs.add(rackReq); - Assert.assertEquals(30, + assertEquals(30, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); anyReq.setRelaxLocality(false); - Assert.assertEquals(30, + assertEquals(30, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(false); - Assert.assertEquals(100, + assertEquals(100, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); ResourceRequest node1Req = createResourceRequest("node1", false, null); reqs.add(node1Req); - Assert.assertEquals(100, + assertEquals(100, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node1Req.setRelaxLocality(true); - Assert.assertEquals(1, + assertEquals(1, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(true); - Assert.assertEquals(31, + assertEquals(31, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); ResourceRequest node2Req = createResourceRequest("node2", false, null); reqs.add(node2Req); - Assert.assertEquals(31, + assertEquals(31, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node2Req.setRelaxLocality(true); - Assert.assertEquals(31, + assertEquals(31, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(false); - Assert.assertEquals(2, + assertEquals(2, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node1Req.setRelaxLocality(false); - Assert.assertEquals(1, + assertEquals(1, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node2Req.setRelaxLocality(false); - Assert.assertEquals(100, + assertEquals(100, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); } @@ -124,11 +210,11 @@ public void testGetApplicableNodeCountForAMLabels() throws Exception { YarnConfiguration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.NODE_LABELS_ENABLED, true); - ResourceScheduler scheduler = Mockito.mock(ResourceScheduler.class); + ResourceScheduler scheduler = mock(ResourceScheduler.class); Mockito.when(scheduler.getNumClusterNodes()).thenReturn(100); - RMContext rmContext = Mockito.mock(RMContext.class); + RMContext rmContext = mock(RMContext.class); Mockito.when(rmContext.getScheduler()).thenReturn(scheduler); - RMNodeLabelsManager labMan = Mockito.mock(RMNodeLabelsManager.class); + RMNodeLabelsManager labMan = mock(RMNodeLabelsManager.class); Mockito.when(labMan.getNodesWithoutALabel()).thenReturn(noLabelNodes); Mockito.when(labMan.getLabelsToNodes(Collections.singleton("label1"))) .thenReturn(label1NodesMap); @@ -138,10 +224,10 @@ public void testGetApplicableNodeCountForAMLabels() throws Exception { true, null); List reqs = new ArrayList<>(); reqs.add(anyReq); - Assert.assertEquals(80, + assertEquals(80, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); anyReq.setNodeLabelExpression("label1"); - Assert.assertEquals(10, + assertEquals(10, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); } @@ -178,16 +264,16 @@ public void testGetApplicableNodeCountForAMLocalityAndLabels() YarnConfiguration conf = new YarnConfiguration(); conf.setBoolean(YarnConfiguration.NODE_LABELS_ENABLED, true); - ResourceScheduler scheduler = Mockito.mock(ResourceScheduler.class); + ResourceScheduler scheduler = mock(ResourceScheduler.class); Mockito.when(scheduler.getNumClusterNodes()).thenReturn(100); Mockito.when(scheduler.getNodeIds("/rack1")).thenReturn(rack1Nodes); Mockito.when(scheduler.getNodeIds("node1")) .thenReturn(Collections.singletonList(node1)); Mockito.when(scheduler.getNodeIds("node2")) .thenReturn(Collections.singletonList(node2)); - RMContext rmContext = Mockito.mock(RMContext.class); + RMContext rmContext = mock(RMContext.class); Mockito.when(rmContext.getScheduler()).thenReturn(scheduler); - RMNodeLabelsManager labMan = Mockito.mock(RMNodeLabelsManager.class); + RMNodeLabelsManager labMan = mock(RMNodeLabelsManager.class); Mockito.when(labMan.getNodesWithoutALabel()).thenReturn(noLabelNodes); Mockito.when(labMan.getLabelsToNodes(Collections.singleton("label1"))) .thenReturn(label1NodesMap); @@ -197,46 +283,46 @@ public void testGetApplicableNodeCountForAMLocalityAndLabels() true, null); List reqs = new ArrayList<>(); reqs.add(anyReq); - Assert.assertEquals(80, + assertEquals(80, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); ResourceRequest rackReq = createResourceRequest("/rack1", true, null); reqs.add(rackReq); - Assert.assertEquals(20, + assertEquals(20, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); anyReq.setRelaxLocality(false); - Assert.assertEquals(20, + assertEquals(20, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(false); - Assert.assertEquals(80, + assertEquals(80, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); ResourceRequest node1Req = createResourceRequest("node1", false, null); reqs.add(node1Req); - Assert.assertEquals(80, + assertEquals(80, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node1Req.setRelaxLocality(true); - Assert.assertEquals(0, + assertEquals(0, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(true); - Assert.assertEquals(20, + assertEquals(20, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); ResourceRequest node2Req = createResourceRequest("node2", false, null); reqs.add(node2Req); - Assert.assertEquals(20, + assertEquals(20, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node2Req.setRelaxLocality(true); - Assert.assertEquals(20, + assertEquals(20, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(false); - Assert.assertEquals(1, + assertEquals(1, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node1Req.setRelaxLocality(false); - Assert.assertEquals(1, + assertEquals(1, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node2Req.setRelaxLocality(false); - Assert.assertEquals(80, + assertEquals(80, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); anyReq.setNodeLabelExpression("label1"); @@ -246,46 +332,46 @@ public void testGetApplicableNodeCountForAMLocalityAndLabels() anyReq.setRelaxLocality(true); reqs = new ArrayList<>(); reqs.add(anyReq); - Assert.assertEquals(15, + assertEquals(15, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(true); reqs.add(rackReq); - Assert.assertEquals(10, + assertEquals(10, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); anyReq.setRelaxLocality(false); - Assert.assertEquals(10, + assertEquals(10, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(false); - Assert.assertEquals(15, + assertEquals(15, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node1Req.setRelaxLocality(false); reqs.add(node1Req); - Assert.assertEquals(15, + assertEquals(15, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node1Req.setRelaxLocality(true); - Assert.assertEquals(1, + assertEquals(1, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(true); - Assert.assertEquals(11, + assertEquals(11, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node2Req.setRelaxLocality(false); reqs.add(node2Req); - Assert.assertEquals(11, + assertEquals(11, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node2Req.setRelaxLocality(true); - Assert.assertEquals(11, + assertEquals(11, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); rackReq.setRelaxLocality(false); - Assert.assertEquals(1, + assertEquals(1, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node1Req.setRelaxLocality(false); - Assert.assertEquals(0, + assertEquals(0, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); node2Req.setRelaxLocality(false); - Assert.assertEquals(15, + assertEquals(15, RMServerUtils.getApplicableNodeCountForAM(rmContext, conf, reqs)); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMLaunchFailure.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMLaunchFailure.java index ad39099999d..62b9632b403 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMLaunchFailure.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMLaunchFailure.java @@ -99,7 +99,7 @@ // } // // @Override -// public Resource getMaximumResourceCapability() { +// public Resource getMaximumContainerAllocation() { // // TODO Auto-generated method stub // return null; // } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestSchedulerNegotiator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestSchedulerNegotiator.java index fedbf2b353d..00e234c33d1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestSchedulerNegotiator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestSchedulerNegotiator.java @@ -92,7 +92,7 @@ // // // @Override -// public Resource getMaximumResourceCapability() { +// public Resource getMaximumContainerAllocation() { // // TODO Auto-generated method stub // return null; // } 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/TestSchedulerUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java index 2ec2de29ff7..751b268ea5a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerUtils.java @@ -106,6 +106,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import org.junit.rules.ExpectedException; +import org.mockito.Mockito; public class TestSchedulerUtils { @@ -271,7 +272,7 @@ public void testNormalizeRequestWithDominantResourceCalculator() { public void testValidateResourceRequestWithErrorLabelsPermission() throws IOException { // mock queue and scheduler - YarnScheduler scheduler = mock(YarnScheduler.class); + ResourceScheduler scheduler = mock(ResourceScheduler.class); Set queueAccessibleNodeLabels = Sets.newHashSet(); QueueInfo queueInfo = mock(QueueInfo.class); when(queueInfo.getQueueName()).thenReturn("queue"); @@ -280,6 +281,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() when(scheduler.getQueueInfo(any(String.class), anyBoolean(), anyBoolean())) .thenReturn(queueInfo); + when(rmContext.getScheduler()).thenReturn(scheduler); + Resource maxResource = Resources.createResource( YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES); @@ -298,20 +301,20 @@ public void testValidateResourceRequestWithErrorLabelsPermission() ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), ResourceRequest.ANY, resource, 1); resReq.setNodeLabelExpression("x"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); resReq.setNodeLabelExpression("y"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); resReq.setNodeLabelExpression(""); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); resReq.setNodeLabelExpression(" "); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); } catch (InvalidResourceRequestException e) { e.printStackTrace(); fail("Should be valid when request labels is a subset of queue labels"); @@ -332,8 +335,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), ResourceRequest.ANY, resource, 1); resReq.setNodeLabelExpression("x"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); fail("Should fail"); } catch (InvalidResourceRequestException e) { @@ -354,8 +357,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), ResourceRequest.ANY, resource, 1); resReq.setNodeLabelExpression("z"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); fail("Should fail"); } catch (InvalidResourceRequestException e) { } finally { @@ -379,8 +382,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), ResourceRequest.ANY, resource, 1); resReq.setNodeLabelExpression("x && y"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); fail("Should fail"); } catch (InvalidResourceRequestException e) { } finally { @@ -399,16 +402,16 @@ public void testValidateResourceRequestWithErrorLabelsPermission() YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES); ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); resReq.setNodeLabelExpression(""); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); resReq.setNodeLabelExpression(" "); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); } catch (InvalidResourceRequestException e) { e.printStackTrace(); fail("Should be valid when request labels is empty"); @@ -428,8 +431,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), ResourceRequest.ANY, resource, 1); resReq.setNodeLabelExpression("x"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); fail("Should fail"); } catch (InvalidLabelResourceRequestException e) { invalidlabelexception = true; @@ -456,16 +459,16 @@ public void testValidateResourceRequestWithErrorLabelsPermission() ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), ResourceRequest.ANY, resource, 1); resReq.setNodeLabelExpression("x"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); resReq.setNodeLabelExpression("y"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); resReq.setNodeLabelExpression("z"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); } catch (InvalidResourceRequestException e) { e.printStackTrace(); fail("Should be valid when queue can access any labels"); @@ -486,8 +489,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), ResourceRequest.ANY, resource, 1); resReq.setNodeLabelExpression("x"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); fail("Should fail"); } catch (InvalidResourceRequestException e) { } @@ -507,8 +510,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), "rack", resource, 1); resReq.setNodeLabelExpression("x"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); fail("Should fail"); } catch (InvalidResourceRequestException e) { } finally { @@ -532,8 +535,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), "rack", resource, 1); resReq.setNodeLabelExpression("x"); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); fail("Should fail"); } catch (InvalidResourceRequestException e) { } finally { @@ -545,8 +548,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES); ResourceRequest resReq1 = BuilderUtils .newResourceRequest(mock(Priority.class), "*", resource, 1, "x"); - SchedulerUtils.normalizeAndvalidateRequest(resReq1, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq1, "queue", + scheduler, rmContext, maxResource); fail("Should fail"); } catch (InvalidResourceRequestException e) { assertEquals("Invalid label resource request, cluster do not contain , " @@ -560,8 +563,8 @@ public void testValidateResourceRequestWithErrorLabelsPermission() YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES); ResourceRequest resReq1 = BuilderUtils .newResourceRequest(mock(Priority.class), "*", resource, 1, "x"); - SchedulerUtils.normalizeAndvalidateRequest(resReq1, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq1, "queue", + scheduler, rmContext, maxResource); Assert.assertEquals(RMNodeLabelsManager.NO_LABEL, resReq1.getNodeLabelExpression()); } catch (InvalidResourceRequestException e) { @@ -571,14 +574,21 @@ public void testValidateResourceRequestWithErrorLabelsPermission() } @Test(timeout = 30000) - public void testValidateResourceRequest() { - YarnScheduler mockScheduler = mock(YarnScheduler.class); + public void testValidateResourceRequest() throws IOException { + ResourceScheduler mockScheduler = mock(ResourceScheduler.class); + + QueueInfo queueInfo = mock(QueueInfo.class); + when(queueInfo.getQueueName()).thenReturn("queue"); Resource maxResource = Resources.createResource( YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES); + when(rmContext.getScheduler()).thenReturn(mockScheduler); + when(mockScheduler.getQueueInfo(Mockito.anyString(), Mockito.anyBoolean(), + Mockito.anyBoolean())).thenReturn(queueInfo); + // zero memory try { Resource resource = @@ -587,8 +597,8 @@ public void testValidateResourceRequest() { ResourceRequest resReq = BuilderUtils.newResourceRequest(mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, null, - mockScheduler, rmContext); + normalizeAndvalidateRequest(resReq, null, + mockScheduler, rmContext, maxResource); } catch (InvalidResourceRequestException e) { fail("Zero memory should be accepted"); } @@ -601,8 +611,8 @@ public void testValidateResourceRequest() { ResourceRequest resReq = BuilderUtils.newResourceRequest(mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, null, - mockScheduler, rmContext); + normalizeAndvalidateRequest(resReq, null, + mockScheduler, rmContext, maxResource); } catch (InvalidResourceRequestException e) { fail("Zero vcores should be accepted"); } @@ -616,8 +626,8 @@ public void testValidateResourceRequest() { ResourceRequest resReq = BuilderUtils.newResourceRequest(mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, null, - mockScheduler, rmContext); + normalizeAndvalidateRequest(resReq, null, + mockScheduler, rmContext, maxResource); } catch (InvalidResourceRequestException e) { fail("Max memory should be accepted"); } @@ -631,8 +641,8 @@ public void testValidateResourceRequest() { ResourceRequest resReq = BuilderUtils.newResourceRequest(mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, null, - mockScheduler, rmContext); + normalizeAndvalidateRequest(resReq, null, + mockScheduler, rmContext, maxResource); } catch (InvalidResourceRequestException e) { fail("Max vcores should not be accepted"); } @@ -645,8 +655,8 @@ public void testValidateResourceRequest() { ResourceRequest resReq = BuilderUtils.newResourceRequest(mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, null, - mockScheduler, rmContext); + normalizeAndvalidateRequest(resReq, null, + mockScheduler, rmContext, maxResource); fail("Negative memory should not be accepted"); } catch (InvalidResourceRequestException e) { assertEquals(LESS_THAN_ZERO, e.getInvalidResourceType()); @@ -660,8 +670,8 @@ public void testValidateResourceRequest() { ResourceRequest resReq = BuilderUtils.newResourceRequest(mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, null, - mockScheduler, rmContext); + normalizeAndvalidateRequest(resReq, null, + mockScheduler, rmContext, maxResource); fail("Negative vcores should not be accepted"); } catch (InvalidResourceRequestException e) { assertEquals(LESS_THAN_ZERO, e.getInvalidResourceType()); @@ -676,8 +686,8 @@ public void testValidateResourceRequest() { ResourceRequest resReq = BuilderUtils.newResourceRequest(mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, null, - mockScheduler, rmContext); + normalizeAndvalidateRequest(resReq, null, + mockScheduler, rmContext, maxResource); fail("More than max memory should not be accepted"); } catch (InvalidResourceRequestException e) { assertEquals(GREATER_THEN_MAX_ALLOCATION, e.getInvalidResourceType()); @@ -691,8 +701,8 @@ public void testValidateResourceRequest() { ResourceRequest resReq = BuilderUtils.newResourceRequest(mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, null, - mockScheduler, rmContext); + normalizeAndvalidateRequest(resReq, null, + mockScheduler, rmContext, maxResource); fail("More than max vcores should not be accepted"); } catch (InvalidResourceRequestException e) { assertEquals(GREATER_THEN_MAX_ALLOCATION, e.getInvalidResourceType()); @@ -805,7 +815,7 @@ public void testCreatePreemptedContainerStatus() { public void testNormalizeNodeLabelExpression() throws IOException { // mock queue and scheduler - YarnScheduler scheduler = mock(YarnScheduler.class); + ResourceScheduler scheduler = mock(ResourceScheduler.class); Set queueAccessibleNodeLabels = Sets.newHashSet(); QueueInfo queueInfo = mock(QueueInfo.class); when(queueInfo.getQueueName()).thenReturn("queue"); @@ -818,6 +828,8 @@ public void testNormalizeNodeLabelExpression() YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES); + when(rmContext.getScheduler()).thenReturn(scheduler); + // queue has labels, success cases try { // set queue accessible node labels to [x, y] @@ -831,13 +843,13 @@ public void testNormalizeNodeLabelExpression() YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES); ResourceRequest resReq = BuilderUtils.newResourceRequest( mock(Priority.class), ResourceRequest.ANY, resource, 1); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); Assert.assertEquals("x", resReq.getNodeLabelExpression()); resReq.setNodeLabelExpression(" y "); - SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue", - scheduler, rmContext); + normalizeAndvalidateRequest(resReq, "queue", + scheduler, rmContext, maxResource); Assert.assertEquals("y", resReq.getNodeLabelExpression()); } catch (InvalidResourceRequestException e) { e.printStackTrace(); @@ -1033,6 +1045,14 @@ private static RMContext getMockRMContext() { return rmContext; } + private static void normalizeAndvalidateRequest(ResourceRequest resReq, + String queueName, YarnScheduler scheduler, RMContext rmContext, + Resource maxAllocation) + throws InvalidResourceRequestException { + SchedulerUtils.normalizeAndvalidateRequest(resReq, queueName, scheduler, + rmContext, null, maxAllocation); + } + private static class InvalidResourceRequestExceptionMessageGenerator { private StringBuilder sb; 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/TestCapacityScheduler.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/TestCapacityScheduler.java index e77d8e21264..586ae040247 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/TestCapacityScheduler.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/TestCapacityScheduler.java @@ -18,6 +18,8 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.MAXIMUM_ALLOCATION_MB; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.MAXIMUM_ALLOCATION_VCORES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -835,6 +837,40 @@ public void testMaximumCapacitySetup() { assertEquals(CapacitySchedulerConfiguration.MAXIMUM_CAPACITY_VALUE,conf.getNonLabeledQueueMaximumCapacity(A),delta); } + @Test + public void testQueueMaximumAllocations() throws IOException { + CapacityScheduler scheduler = new CapacityScheduler(); + scheduler.setConf(new YarnConfiguration()); + scheduler.setRMContext(resourceManager.getRMContext()); + CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); + + setupQueueConfiguration(conf); + conf.set(CapacitySchedulerConfiguration.getQueuePrefix(A1) + + MAXIMUM_ALLOCATION_MB, "1024"); + conf.set(CapacitySchedulerConfiguration.getQueuePrefix(A1) + + MAXIMUM_ALLOCATION_VCORES, "1"); + + scheduler.init(conf); + scheduler.start(); + + Resource maxAllocationForQueue = scheduler.getMaximumResourceCapability("a1"); + Resource maxAllocation1 = scheduler.getMaximumResourceCapability(""); + Resource maxAllocation2 = scheduler.getMaximumResourceCapability(null); + Resource maxAllocation3 = scheduler.getMaximumResourceCapability(); + + Assert.assertEquals(maxAllocation1, maxAllocation2); + Assert.assertEquals(maxAllocation1, maxAllocation3); + Assert.assertEquals( + YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, + maxAllocation1.getMemorySize()); + Assert.assertEquals( + YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES, + maxAllocation1.getVirtualCores()); + + Assert.assertEquals(1024, maxAllocationForQueue.getMemorySize()); + Assert.assertEquals(1, maxAllocationForQueue.getVirtualCores()); + } + @Test public void testRefreshQueues() throws Exception { @@ -4009,7 +4045,7 @@ private void setMaxAllocMb(Configuration conf, int maxAllocMb) { private void setMaxAllocMb(CapacitySchedulerConfiguration conf, String queueName, int maxAllocMb) { String propName = CapacitySchedulerConfiguration.getQueuePrefix(queueName) - + CapacitySchedulerConfiguration.MAXIMUM_ALLOCATION_MB; + + MAXIMUM_ALLOCATION_MB; conf.setInt(propName, maxAllocMb); } 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/fair/FairSchedulerTestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerTestBase.java index 3ac3849cf73..4f1f20b942b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerTestBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerTestBase.java @@ -77,6 +77,7 @@ public static final float TEST_RESERVATION_THRESHOLD = 0.09f; private static final int SLEEP_DURATION = 10; private static final int SLEEP_RETRIES = 1000; + protected static final int RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE = 10240; final static ContainerUpdates NULL_UPDATE_REQUESTS = new ContainerUpdates(); @@ -93,7 +94,8 @@ public Configuration createConfiguration() { conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 0); conf.setInt(FairSchedulerConfiguration.RM_SCHEDULER_INCREMENT_ALLOCATION_MB, 1024); - conf.setInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, 10240); + conf.setInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, + RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE); conf.setBoolean(FairSchedulerConfiguration.ASSIGN_MULTIPLE, false); conf.setLong(FairSchedulerConfiguration.UPDATE_INTERVAL_MS, 10); conf.setFloat(FairSchedulerConfiguration.PREEMPTION_THRESHOLD, 0f); 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/fair/TestAllocationFileLoaderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestAllocationFileLoaderService.java index 50a003ecd11..37a8a23f136 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestAllocationFileLoaderService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestAllocationFileLoaderService.java @@ -17,12 +17,32 @@ */ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair; +import static org.apache.hadoop.yarn.util.resource.ResourceUtils.UNITS; +import static org.junit.Assert.*; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.UnsupportedFileSystemException; import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.api.records.ResourceInformation; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.QueuePlacementRule.NestedUserQueue; @@ -30,29 +50,14 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.DominantResourceFairnessPolicy; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.FairSharePolicy; import org.apache.hadoop.yarn.util.ControlledClock; +import org.apache.hadoop.yarn.util.resource.ResourceUtils; import org.apache.hadoop.yarn.util.resource.Resources; import org.junit.Test; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; public class TestAllocationFileLoaderService { + private static final String A_CUSTOM_RESOURCE = "a-custom-resource"; + final static String TEST_DIR = new File(System.getProperty("test.build.data", "/tmp")).getAbsolutePath(); @@ -201,10 +206,34 @@ public void testReload() throws Exception { .contains("root.queueB")); } + private void initResourceTypes() { + Map riMap = new HashMap<>(); + + // Initialize mandatory resources + ResourceInformation memory = + ResourceInformation.newInstance(ResourceInformation.MEMORY_MB.getName(), + ResourceInformation.MEMORY_MB.getUnits(), + YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB, + YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB); + ResourceInformation vcores = + ResourceInformation.newInstance(ResourceInformation.VCORES.getName(), + ResourceInformation.VCORES.getUnits(), + YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES, + YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES); + riMap.put(ResourceInformation.MEMORY_URI, memory); + riMap.put(ResourceInformation.VCORES_URI, vcores); + riMap.put(A_CUSTOM_RESOURCE, ResourceInformation.newInstance( + A_CUSTOM_RESOURCE, "", 0, ResourceTypes.COUNTABLE, 0, 3333L)); + + ResourceUtils.initializeResourcesFromResourceInformationMap(riMap); + } + @Test public void testAllocationFileParsing() throws Exception { - Configuration conf = new Configuration(); + Configuration conf = new YarnConfiguration(); + initResourceTypes(); conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE); + AllocationFileLoaderService allocLoader = new AllocationFileLoaderService(); AllocationFileWriter @@ -246,6 +275,8 @@ public void testAllocationFileParsing() throws Exception { .fairSharePreemptionTimeout(120) .minSharePreemptionTimeout(50) .fairSharePreemptionThreshold(0.6) + .maxContainerAllocation( + "vcores=16, memory-mb=512, " + A_CUSTOM_RESOURCE + "=10") // Create hierarchical queues G,H, with different min/fair // share preemption timeouts and preemption thresholds. // Also add a child default to make sure it doesn't impact queue H. @@ -253,6 +284,7 @@ public void testAllocationFileParsing() throws Exception { .fairSharePreemptionTimeout(180) .minSharePreemptionTimeout(40) .fairSharePreemptionThreshold(0.7) + .maxContainerAllocation("1024mb,8vcores") .buildSubQueue() .buildQueue() // Set default limit of apps per queue to 15 @@ -286,8 +318,6 @@ public void testAllocationFileParsing() throws Exception { assertEquals(6, queueConf.getConfiguredQueues().get(FSQueueType.LEAF).size()); assertEquals(Resources.createResource(0), queueConf.getMinResources("root." + YarnConfiguration.DEFAULT_QUEUE_NAME)); - assertEquals(Resources.createResource(0), - queueConf.getMinResources("root." + YarnConfiguration.DEFAULT_QUEUE_NAME)); assertEquals(Resources.createResource(2048, 10), queueConf.getMaxResources("root.queueA").getResource()); @@ -358,6 +388,28 @@ public void testAllocationFileParsing() throws Exception { assertEquals(.4f, queueConf.getQueueMaxAMShare("root.queueD"), 0.01); assertEquals(.5f, queueConf.getQueueMaxAMShare("root.queueE"), 0.01); + Resource expectedResourceWithCustomType = Resources.createResource(512, 16); + expectedResourceWithCustomType.setResourceValue(A_CUSTOM_RESOURCE, 10); + + assertEquals(Resources.unbounded(), queueConf.getQueueMaxContainerAllocation( + "root." + YarnConfiguration.DEFAULT_QUEUE_NAME)); + assertEquals(Resources.unbounded(), + queueConf.getQueueMaxContainerAllocation("root.queueA")); + assertEquals(Resources.unbounded(), + queueConf.getQueueMaxContainerAllocation("root.queueB")); + assertEquals(Resources.unbounded(), + queueConf.getQueueMaxContainerAllocation("root.queueC")); + assertEquals(Resources.unbounded(), + queueConf.getQueueMaxContainerAllocation("root.queueD")); + assertEquals(Resources.unbounded(), + queueConf.getQueueMaxContainerAllocation("root.queueE")); + assertEquals(Resources.unbounded(), + queueConf.getQueueMaxContainerAllocation("root.queueF")); + assertEquals(expectedResourceWithCustomType, + queueConf.getQueueMaxContainerAllocation("root.queueG")); + assertEquals(Resources.createResource(1024, 8), + queueConf.getQueueMaxContainerAllocation("root.queueG.queueH")); + assertEquals(120000, queueConf.getMinSharePreemptionTimeout("root")); assertEquals(-1, queueConf.getMinSharePreemptionTimeout("root." + YarnConfiguration.DEFAULT_QUEUE_NAME)); 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/fair/TestApplicationMasterServiceWithFS.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestApplicationMasterServiceWithFS.java new file mode 100644 index 00000000000..e5e145d6ff5 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestApplicationMasterServiceWithFS.java @@ -0,0 +1,167 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.test.GenericTestUtils; +import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse; +import org.apache.hadoop.yarn.api.records.Container; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.exceptions.InvalidResourceRequestException; +import org.apache.hadoop.yarn.server.resourcemanager.MockAM; +import org.apache.hadoop.yarn.server.resourcemanager.MockNM; +import org.apache.hadoop.yarn.server.resourcemanager.MockRM; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.google.common.base.Supplier; + +public class TestApplicationMasterServiceWithFS { + + private static final Log LOG = + LogFactory.getLog(TestApplicationMasterServiceWithFS.class); + + private static final int GB = 1024; + private static final int MEMORY_ALLOCATION = 3 * GB; + private AllocateResponse allocateResponse; + private static YarnConfiguration configuration; + + @BeforeClass + public static void setup() throws IOException { + String TEST_DIR = new File(System.getProperty("test.build.data", "/tmp")) + .getAbsolutePath(); + + String ALLOC_FILE = new File(TEST_DIR, "test-queues").getAbsolutePath(); + + configuration = new YarnConfiguration(); + configuration.setClass(YarnConfiguration.RM_SCHEDULER, FairScheduler.class, + ResourceScheduler.class); + configuration.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE); + + PrintWriter out = new PrintWriter(new FileWriter(ALLOC_FILE)); + out.println(""); + out.println(""); + out.println(" "); + out.println( + " 2048 mb 1 vcores"); + out.println(" "); + out.println(" "); + out.println( + " 3072 mb 1 vcores"); + out.println(" "); + out.println(" "); + out.println(" "); + out.println(""); + out.close(); + } + + @Test(timeout = 3000000) + public void testQueueLevelContainerAllocationFail() throws Exception { + MockRM rm = new MockRM(configuration); + rm.start(); + + // Register node1 + MockNM nm1 = rm.registerNode("127.0.0.1:1234", 6 * GB); + + // Submit an application + RMApp app1 = rm.submitApp(2 * GB, "queueA"); + + // kick the scheduling + nm1.nodeHeartbeat(true); + RMAppAttempt attempt1 = app1.getCurrentAppAttempt(); + MockAM am1 = rm.sendAMLaunched(attempt1.getAppAttemptId()); + am1.registerAppAttempt(); + + am1.addRequests(new String[] { "127.0.0.1" }, MEMORY_ALLOCATION, 1, 1); + try { + allocateResponse = am1.schedule(); // send the request + Assert.fail(); + } catch (Exception e) { + Assert.assertTrue(e instanceof InvalidResourceRequestException); + Assert.assertEquals( + InvalidResourceRequestException.InvalidResourceType.GREATER_THEN_MAX_ALLOCATION, + ((InvalidResourceRequestException) e).getInvalidResourceType()); + + } finally { + rm.stop(); + } + } + + @Test(timeout = 3000000) + public void testQueueLevelContainerAllocationSuccess() throws Exception { + testFairSchedulerContainerAllocationSuccess("queueB"); + } + + @Test(timeout = 3000000) + public void testSchedulerLevelContainerAllocationSuccess() throws Exception { + testFairSchedulerContainerAllocationSuccess("queueC"); + } + + private void testFairSchedulerContainerAllocationSuccess(String queueName) + throws Exception { + MockRM rm = new MockRM(configuration); + rm.start(); + + // Register node1 + MockNM nm1 = rm.registerNode("127.0.0.1:1234", 6 * GB); + + // Submit an application + RMApp app1 = rm.submitApp(2 * GB, queueName); + + // kick the scheduling + nm1.nodeHeartbeat(true); + RMAppAttempt attempt1 = app1.getCurrentAppAttempt(); + MockAM am1 = rm.sendAMLaunched(attempt1.getAppAttemptId()); + am1.registerAppAttempt(); + + am1.addRequests(new String[] { "127.0.0.1" }, MEMORY_ALLOCATION, 1, 1); + + allocateResponse = am1.schedule(); // send the request + ((FairScheduler) rm.getResourceScheduler()).update(); + + // kick the scheduler + nm1.nodeHeartbeat(true); + GenericTestUtils.waitFor(() -> { + LOG.info("Waiting for containers to be created for app 1"); + try { + allocateResponse = am1.schedule(); + } catch (Exception e) { + Assert.fail("Allocation should be successful"); + } + return allocateResponse.getAllocatedContainers().size() > 0; + }, 1000, 10000); + + Container allocatedContainer = + allocateResponse.getAllocatedContainers().get(0); + Assert.assertEquals(MEMORY_ALLOCATION, + allocatedContainer.getResource().getMemorySize()); + Assert.assertEquals(1, allocatedContainer.getResource().getVirtualCores()); + rm.stop(); + } +} 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/fair/TestFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java index 9120d3a6cc1..f4f6531bdcd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair; +import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; @@ -102,6 +103,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode; @@ -198,8 +200,6 @@ public void testConfValidation() throws Exception { } } - // TESTS - @SuppressWarnings("deprecation") @Test(timeout=2000) public void testLoadConfigurationOnInitialize() throws IOException { @@ -338,6 +338,111 @@ public void testSimpleFairShareCalculation() throws IOException { } } + @Test + public void testQueueMaximumCapacityAllocations() throws IOException { + conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE); + + int tooHighQueueAllocation = RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE +1; + + PrintWriter out = new PrintWriter(new FileWriter(ALLOC_FILE)); + out.println(""); + out.println(""); + out.println(" "); + out.println( + " 512 mb 1 vcores"); + out.println(" "); + out.println(" "); + out.println(" "); + out.println(" "); + out.println( + " 2048 mb 3 vcores"); + out.println(" "); + out.println(" "); + out.println(" "); + out.println(" "); + out.println(" " + tooHighQueueAllocation + + " mb 1 vcores"); + out.println(" "); + out.println(""); + out.close(); + + scheduler.init(conf); + + Assert.assertEquals(1, scheduler.getMaximumResourceCapability("root.queueA") + .getVirtualCores()); + Assert.assertEquals(512, + scheduler.getMaximumResourceCapability("root.queueA").getMemorySize()); + + Assert.assertEquals(DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES, + scheduler.getMaximumResourceCapability("root.queueB") + .getVirtualCores()); + Assert.assertEquals(RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, + scheduler.getMaximumResourceCapability("root.queueB").getMemorySize()); + + Assert.assertEquals(3, scheduler.getMaximumResourceCapability("root.queueC") + .getVirtualCores()); + Assert.assertEquals(2048, + scheduler.getMaximumResourceCapability("root.queueC").getMemorySize()); + + Assert.assertEquals(3, scheduler + .getMaximumResourceCapability("root.queueC.queueD").getVirtualCores()); + Assert.assertEquals(2048, scheduler + .getMaximumResourceCapability("root.queueC.queueD").getMemorySize()); + + Assert.assertEquals(RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, scheduler + .getMaximumResourceCapability("root.queueE").getMemorySize()); + } + + @Test + public void testNormalizationUsingQueueMaximumAllocation() + throws IOException { + + int queueMaxAllocation = 4096; + conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE); + + PrintWriter out = new PrintWriter(new FileWriter(ALLOC_FILE)); + out.println(""); + out.println(""); + out.println(" "); + out.println(" " + queueMaxAllocation + + " mb 1 vcores" + ""); + out.println(" "); + out.println(" "); + out.println(" "); + out.println(""); + out.close(); + + scheduler.init(conf); + scheduler.start(); + scheduler.reinitialize(conf, resourceManager.getRMContext()); + + allocateAppAttempt("root.queueA", 1, queueMaxAllocation + 1024); + allocateAppAttempt("root.queueB", 2, + RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE + 1024); + + scheduler.update(); + FSQueue queueToCheckA = scheduler.getQueueManager().getQueue("root.queueA"); + FSQueue queueToCheckB = scheduler.getQueueManager().getQueue("root.queueB"); + + assertEquals(queueMaxAllocation, queueToCheckA.getDemand().getMemorySize()); + assertEquals(RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, + queueToCheckB.getDemand().getMemorySize()); + } + + private void allocateAppAttempt(String queueName, int id, int memorySize) { + ApplicationAttemptId id11 = createAppAttemptId(id, id); + createMockRMApp(id11); + scheduler.addApplication(id11.getApplicationId(), queueName, "user1", + false); + scheduler.addApplicationAttempt(id11, false, false); + List ask1 = new ArrayList(); + ResourceRequest request1 = + createResourceRequest(memorySize, ResourceRequest.ANY, 1, 1, true); + ask1.add(request1); + scheduler.allocate(id11, ask1, null, new ArrayList(), null, + null, NULL_UPDATE_REQUESTS); + } + /** * Test fair shares when max resources are set but are too high to impact * the shares. @@ -1316,8 +1421,9 @@ public void testRackLocalAppReservationThreshold() throws Exception { // New node satisfies resource request scheduler.update(); scheduler.handle(new NodeUpdateSchedulerEvent(node4)); - assertEquals(10240, scheduler.getQueueManager().getQueue("queue1"). - getResourceUsage().getMemorySize()); + assertEquals(RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, + scheduler.getQueueManager().getQueue("queue1").getResourceUsage() + .getMemorySize()); scheduler.handle(new NodeUpdateSchedulerEvent(node1)); scheduler.handle(new NodeUpdateSchedulerEvent(node2)); @@ -4099,12 +4205,12 @@ public void testQueueMaxAMShareWithContainerReservation() throws Exception { scheduler.start(); scheduler.reinitialize(conf, resourceManager.getRMContext()); - RMNode node1 = - MockNodes.newNodeInfo(1, Resources.createResource(10240, 10), - 1, "127.0.0.1"); - RMNode node2 = - MockNodes.newNodeInfo(1, Resources.createResource(10240, 10), - 2, "127.0.0.2"); + RMNode node1 = MockNodes.newNodeInfo(1, + Resources.createResource(RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, 10), + 1, "127.0.0.1"); + RMNode node2 = MockNodes.newNodeInfo(1, + Resources.createResource(RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, 10), + 2, "127.0.0.2"); RMNode node3 = MockNodes.newNodeInfo(1, Resources.createResource(5120, 5), 3, "127.0.0.3"); @@ -4122,10 +4228,12 @@ public void testQueueMaxAMShareWithContainerReservation() throws Exception { true); Resource amResource1 = Resource.newInstance(1024, 1); Resource amResource2 = Resource.newInstance(1024, 1); - Resource amResource3 = Resource.newInstance(10240, 1); + Resource amResource3 = + Resource.newInstance(RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, 1); Resource amResource4 = Resource.newInstance(5120, 1); Resource amResource5 = Resource.newInstance(1024, 1); - Resource amResource6 = Resource.newInstance(10240, 1); + Resource amResource6 = + Resource.newInstance(RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, 1); Resource amResource7 = Resource.newInstance(1024, 1); Resource amResource8 = Resource.newInstance(1024, 1); int amPriority = RMAppAttemptImpl.AM_CONTAINER_PRIORITY.getPriority(); @@ -4159,7 +4267,8 @@ public void testQueueMaxAMShareWithContainerReservation() throws Exception { ApplicationAttemptId attId3 = createAppAttemptId(3, 1); createApplicationWithAMResource(attId3, "queue1", "user1", amResource3); - createSchedulingRequestExistingApplication(10240, 1, amPriority, attId3); + createSchedulingRequestExistingApplication( + RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, 1, amPriority, attId3); FSAppAttempt app3 = scheduler.getSchedulerApp(attId3); scheduler.update(); // app3 reserves a container on node1 because node1's available resource @@ -4233,7 +4342,8 @@ public void testQueueMaxAMShareWithContainerReservation() throws Exception { ApplicationAttemptId attId6 = createAppAttemptId(6, 1); createApplicationWithAMResource(attId6, "queue1", "user1", amResource6); - createSchedulingRequestExistingApplication(10240, 1, amPriority, attId6); + createSchedulingRequestExistingApplication( + RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, 1, amPriority, attId6); FSAppAttempt app6 = scheduler.getSchedulerApp(attId6); scheduler.update(); // app6 can't reserve a container on node1 because @@ -4322,7 +4432,8 @@ public void testQueueMaxAMShareWithContainerReservation() throws Exception { // app6 turns the reservation into an allocation on node2. scheduler.handle(updateE2); assertEquals("Application6's AM requests 10240 MB memory", - 10240, app6.getAMResource().getMemorySize()); + RM_SCHEDULER_MAXIMUM_ALLOCATION_MB_VALUE, + app6.getAMResource().getMemorySize()); assertEquals("Application6's AM should be running", 1, app6.getLiveContainers().size()); assertEquals("Queue1's AM resource usage should be 11264 MB memory", 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/fair/allocationfile/AllocationFileQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocationfile/AllocationFileQueue.java index f1afe6979fc..de2f1ec37ca 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocationfile/AllocationFileQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocationfile/AllocationFileQueue.java @@ -60,9 +60,13 @@ String render() { () -> AllocationFileWriter .createNumberSupplier(properties.getFairSharePreemptionTimeout())); AllocationFileWriter.addIfPresent(pw, "fairSharePreemptionThreshold", - () -> AllocationFileWriter - .createNumberSupplier( - properties.getFairSharePreemptionThreshold())); + () -> AllocationFileWriter + .createNumberSupplier( + properties.getFairSharePreemptionThreshold())); + AllocationFileWriter.addIfPresent(pw, "maxContainerAllocation", + () -> AllocationFileWriter + .createNumberSupplier( + properties.getMaxContainerAllocation())); printEndTag(pw); pw.close(); return sw.toString(); 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/fair/allocationfile/AllocationFileQueueBuilder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocationfile/AllocationFileQueueBuilder.java index a2faf1da318..176024e9b46 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocationfile/AllocationFileQueueBuilder.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocationfile/AllocationFileQueueBuilder.java @@ -94,6 +94,12 @@ public AllocationFileQueueBuilder fairSharePreemptionThreshold( return this; } + public AllocationFileQueueBuilder maxContainerAllocation( + String maxContainerAllocation) { + this.queuePropertiesBuilder.maxContainerAllocation(maxContainerAllocation); + return this; + } + public AllocationFileQueueBuilder subQueue(String queueName) { if (this instanceof AllocationFileSimpleQueueBuilder) { return new AllocationFileSubQueueBuilder( 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/fair/allocationfile/AllocationFileQueueProperties.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocationfile/AllocationFileQueueProperties.java index 2c01144a152..dc958519c90 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocationfile/AllocationFileQueueProperties.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/allocationfile/AllocationFileQueueProperties.java @@ -33,6 +33,7 @@ private final String maxChildResources; private final Integer fairSharePreemptionTimeout; private final Double fairSharePreemptionThreshold; + private final String maxContainerAllocation; AllocationFileQueueProperties(Builder builder) { this.queueName = builder.queueName; @@ -48,6 +49,7 @@ this.maxChildResources = builder.maxChildResources; this.fairSharePreemptionTimeout = builder.fairSharePreemptionTimeout; this.fairSharePreemptionThreshold = builder.fairSharePreemptionThreshold; + this.maxContainerAllocation = builder.maxContainerAllocation; } public String getQueueName() { @@ -102,6 +104,8 @@ public Double getFairSharePreemptionThreshold() { return fairSharePreemptionThreshold; } + public String getMaxContainerAllocation() { return maxContainerAllocation; } + /** * Builder class for {@link AllocationFileQueueProperties}. */ @@ -119,6 +123,7 @@ public Double getFairSharePreemptionThreshold() { private String maxChildResources; private Integer fairSharePreemptionTimeout; private Double fairSharePreemptionThreshold; + private String maxContainerAllocation; Builder() { } @@ -167,6 +172,11 @@ public Builder maxAMShare(Double maxAMShare) { return this; } + public Builder maxContainerAllocation(String maxContainerResources) { + this.maxContainerAllocation = maxContainerResources; + return this; + } + public Builder minSharePreemptionTimeout( Integer minSharePreemptionTimeout) { this.minSharePreemptionTimeout = minSharePreemptionTimeout; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/FairScheduler.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/FairScheduler.md index b5bcbf5c8e9..d246b85b6d8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/FairScheduler.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/FairScheduler.md @@ -90,6 +90,8 @@ The allocation file must be in XML format. The format contains five types of ele * **maxResources**: maximum resources a queue will allocated, expressed in the form of "X%", "X% cpu, Y% memory", "X mb, Y vcores", or "vcores=X, memory-mb=Y". The last form is required when specifying resources other than memory and CPU. In the last form, X and Y can either be a percentage or an integer resource value without units. In the latter case the units will be inferred from the default units configured for that resource. A queue will not be assigned a container that would put its aggregate usage over this limit. + * **maxContainerResources**: maximum resources a queue can allocate for a single container, expressed in the form of "X mb, Y vcores" or "vcores=X, memory-mb=Y". The latter form is required when specifying resources other than memory and CPU. If the property is not set it's value is inherited from a parent queue. It's default value is **yarn.scheduler.maximum-allocation-mb**. Cannot be higher than **maxResources**. This property is invalid for root queue. + * **maxChildResources**: maximum resources an ad hoc child queue will allocated, expressed in the form of "X%", "X% cpu, Y% memory", "X mb, Y vcores", or "vcores=X, memory-mb=Y". The last form is required when specifying resources other than memory and CPU. In the last form, X and Y can either be a percentage or an integer resource value without units. In the latter case the units will be inferred from the default units configured for that resource. An ad hoc child queue will not be assigned a container that would put its aggregate usage over this limit. * **maxRunningApps**: limit the number of apps from the queue to run at once