diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java index bdf60bd..7f155e7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DefaultResourceCalculator.java @@ -123,8 +123,7 @@ public Resource multiplyAndNormalizeDown(Resource r, double by, } @Override - public boolean fitsIn(Resource cluster, - Resource smaller, Resource bigger) { + public boolean fitsIn(Resource smaller, Resource bigger) { return smaller.getMemorySize() <= bigger.getMemorySize(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java index 7697e1d..c2c7f9e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/DominantResourceCalculator.java @@ -234,8 +234,7 @@ public Resource multiplyAndNormalizeDown(Resource r, double by, } @Override - public boolean fitsIn(Resource cluster, - Resource smaller, Resource bigger) { + public boolean fitsIn(Resource smaller, Resource bigger) { return smaller.getMemorySize() <= bigger.getMemorySize() && smaller.getVirtualCores() <= bigger.getVirtualCores(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceCalculator.java index 398dac5..d59560f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceCalculator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceCalculator.java @@ -225,8 +225,7 @@ public abstract float divide( /** * Check if a smaller resource can be contained by bigger resource. */ - public abstract boolean fitsIn(Resource cluster, - Resource smaller, Resource bigger); + public abstract boolean fitsIn(Resource smaller, Resource bigger); /** * Check if resource has any major resource types (which are all NodeManagers diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java index a1d14fd..002f08c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java @@ -336,9 +336,9 @@ public static boolean fitsIn(Resource smaller, Resource bigger) { smaller.getVirtualCores() <= bigger.getVirtualCores(); } - public static boolean fitsIn(ResourceCalculator rc, Resource cluster, + public static boolean fitsIn(ResourceCalculator rc, Resource smaller, Resource bigger) { - return rc.fitsIn(cluster, smaller, bigger); + return rc.fitsIn(smaller, bigger); } public static Resource componentwiseMin(Resource lhs, Resource rhs) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java index b123b05..9793fc6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/resource/TestResourceCalculator.java @@ -44,29 +44,28 @@ public TestResourceCalculator(ResourceCalculator rs) { @Test(timeout = 10000) public void testFitsIn() { - Resource cluster = Resource.newInstance(1024, 1); if (resourceCalculator instanceof DefaultResourceCalculator) { - Assert.assertTrue(resourceCalculator.fitsIn(cluster, + Assert.assertTrue(resourceCalculator.fitsIn( Resource.newInstance(1, 2), Resource.newInstance(2, 1))); - Assert.assertTrue(resourceCalculator.fitsIn(cluster, + Assert.assertTrue(resourceCalculator.fitsIn( Resource.newInstance(1, 2), Resource.newInstance(2, 2))); - Assert.assertTrue(resourceCalculator.fitsIn(cluster, + Assert.assertTrue(resourceCalculator.fitsIn( Resource.newInstance(1, 2), Resource.newInstance(1, 2))); - Assert.assertTrue(resourceCalculator.fitsIn(cluster, + Assert.assertTrue(resourceCalculator.fitsIn( Resource.newInstance(1, 2), Resource.newInstance(1, 1))); - Assert.assertFalse(resourceCalculator.fitsIn(cluster, + Assert.assertFalse(resourceCalculator.fitsIn( Resource.newInstance(2, 1), Resource.newInstance(1, 2))); } else if (resourceCalculator instanceof DominantResourceCalculator) { - Assert.assertFalse(resourceCalculator.fitsIn(cluster, + Assert.assertFalse(resourceCalculator.fitsIn( Resource.newInstance(1, 2), Resource.newInstance(2, 1))); - Assert.assertTrue(resourceCalculator.fitsIn(cluster, + Assert.assertTrue(resourceCalculator.fitsIn( Resource.newInstance(1, 2), Resource.newInstance(2, 2))); - Assert.assertTrue(resourceCalculator.fitsIn(cluster, + Assert.assertTrue(resourceCalculator.fitsIn( Resource.newInstance(1, 2), Resource.newInstance(1, 2))); - Assert.assertFalse(resourceCalculator.fitsIn(cluster, + Assert.assertFalse(resourceCalculator.fitsIn( Resource.newInstance(1, 2), Resource.newInstance(1, 1))); - Assert.assertFalse(resourceCalculator.fitsIn(cluster, + Assert.assertFalse(resourceCalculator.fitsIn( Resource.newInstance(2, 1), Resource.newInstance(1, 2))); } } 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 35b0c98..8990977 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 @@ -296,8 +296,7 @@ public static void checkSchedContainerChangeRequest( ResourceScheduler scheduler = rmContext.getScheduler(); RMNode rmNode = request.getSchedulerNode().getRMNode(); if (!Resources.fitsIn(scheduler.getResourceCalculator(), - scheduler.getClusterResource(), targetResource, - rmNode.getTotalCapability())) { + targetResource, rmNode.getTotalCapability())) { String msg = "Target resource=" + targetResource + " of containerId=" + containerId + " is more than node's total resource=" + rmNode.getTotalCapability(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/CapacitySchedulerPreemptionUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/CapacitySchedulerPreemptionUtils.java index 0ae3ef0..176a20f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/CapacitySchedulerPreemptionUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/CapacitySchedulerPreemptionUtils.java @@ -156,7 +156,7 @@ public static boolean tryPreemptContainerAndDeductResToObtain( if (null != toObtainByPartition && Resources.greaterThan(rc, clusterResource, toObtainByPartition, Resources.none()) - && Resources.fitsIn(rc, clusterResource, + && Resources.fitsIn(rc, rmContainer.getAllocatedResource(), totalPreemptionAllowed) && !Resources.isAnyMajorResourceZero(rc, toObtainByPartition)) { Resources.subtractFrom(toObtainByPartition, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java index c730a2d..59f9967 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java @@ -229,7 +229,7 @@ private boolean canPreemptEnoughResourceForAsked(Resource requiredResource, // If we already can allocate the reserved container after preemption, // skip following steps - if (Resources.fitsIn(rc, clusterResource, lacking, + if (Resources.fitsIn(rc, lacking, Resources.none())) { return true; } @@ -270,7 +270,7 @@ private boolean canPreemptEnoughResourceForAsked(Resource requiredResource, } // Lacking <= 0 means we can allocate the reserved container - if (Resources.fitsIn(rc, clusterResource, lacking, Resources.none())) { + if (Resources.fitsIn(rc, lacking, Resources.none())) { 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/monitor/capacity/ReservedContainerCandidatesSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ReservedContainerCandidatesSelector.java index de23d0a..7641051 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ReservedContainerCandidatesSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ReservedContainerCandidatesSelector.java @@ -87,7 +87,7 @@ public NodeForPreemption(float preemptionCost, // Get list of nodes for preemption, ordered by preemption cost List nodesForPreemption = getNodesForPreemption( - clusterResource, queueToPreemptableResourceByPartition, + queueToPreemptableResourceByPartition, selectedCandidates, totalPreemptedResourceAllowed); for (NodeForPreemption nfp : nodesForPreemption) { @@ -97,7 +97,7 @@ public NodeForPreemption(float preemptionCost, } NodeForPreemption preemptionResult = getPreemptionCandidatesOnNode( - nfp.schedulerNode, clusterResource, + nfp.schedulerNode, queueToPreemptableResourceByPartition, selectedCandidates, totalPreemptedResourceAllowed, false); if (null != preemptionResult) { @@ -135,7 +135,7 @@ private Resource getPreemptableResource(String queueName, return preemptable; } - private boolean tryToPreemptFromQueue(Resource cluster, String queueName, + private boolean tryToPreemptFromQueue(String queueName, String partitionName, Map> queueToPreemptableResourceByPartition, Resource required, Resource totalPreemptionAllowed, boolean readOnly) { @@ -145,11 +145,11 @@ private boolean tryToPreemptFromQueue(Resource cluster, String queueName, return false; } - if (!Resources.fitsIn(rc, cluster, required, preemptable)) { + if (!Resources.fitsIn(rc, required, preemptable)) { return false; } - if (!Resources.fitsIn(rc, cluster, required, totalPreemptionAllowed)) { + if (!Resources.fitsIn(rc, required, totalPreemptionAllowed)) { return false; } @@ -165,7 +165,6 @@ private boolean tryToPreemptFromQueue(Resource cluster, String queueName, /** * Try to check if we can preempt resources for reserved container in given node * @param node - * @param cluster * @param queueToPreemptableResourceByPartition it's a map of * > * @param readOnly do we want to modify preemptable resource after we selected @@ -174,7 +173,7 @@ private boolean tryToPreemptFromQueue(Resource cluster, String queueName, * to satisfy reserved resource */ private NodeForPreemption getPreemptionCandidatesOnNode( - FiCaSchedulerNode node, Resource cluster, + FiCaSchedulerNode node, Map> queueToPreemptableResourceByPartition, Map> selectedCandidates, Resource totalPreemptionAllowed, boolean readOnly) { @@ -204,7 +203,7 @@ private NodeForPreemption getPreemptionCandidatesOnNode( String partition = node.getPartition(); // Avoid preempt any container if required <= available + killable - if (Resources.fitsIn(rc, cluster, reservedContainer.getReservedResource(), + if (Resources.fitsIn(rc, reservedContainer.getReservedResource(), cur)) { return null; } @@ -232,7 +231,7 @@ private NodeForPreemption getPreemptionCandidatesOnNode( // Can we preempt container c? // Check if we have quota to preempt this container - boolean canPreempt = tryToPreemptFromQueue(cluster, containerQueueName, + boolean canPreempt = tryToPreemptFromQueue(containerQueueName, partition, queueToPreemptableResourceByPartition, c.getAllocatedResource(), totalPreemptionAllowed, readOnly); @@ -246,7 +245,7 @@ private NodeForPreemption getPreemptionCandidatesOnNode( Resources.addTo(totalSelected, c.getAllocatedResource()); } Resources.addTo(cur, c.getAllocatedResource()); - if (Resources.fitsIn(rc, cluster, + if (Resources.fitsIn(rc, reservedContainer.getReservedResource(), cur)) { canAllocateReservedContainer = true; break; @@ -282,7 +281,7 @@ private NodeForPreemption getPreemptionCandidatesOnNode( return nfp; } - private List getNodesForPreemption(Resource cluster, + private List getNodesForPreemption( Map> queueToPreemptableResourceByPartition, Map> selectedCandidates, Resource totalPreemptionAllowed) { @@ -292,7 +291,7 @@ private NodeForPreemption getPreemptionCandidatesOnNode( for (FiCaSchedulerNode node : preemptionContext.getScheduler() .getAllNodes()) { if (node.getReservedContainer() != null) { - NodeForPreemption nfp = getPreemptionCandidatesOnNode(node, cluster, + NodeForPreemption nfp = getPreemptionCandidatesOnNode(node, queueToPreemptableResourceByPartition, selectedCandidates, totalPreemptionAllowed, true); if (null != nfp) { 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/AbstractCSQueue.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/AbstractCSQueue.java index d7c452a..250f4e6 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/AbstractCSQueue.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/AbstractCSQueue.java @@ -909,7 +909,7 @@ public boolean accept(Resource cluster, maxResourceLimit = labelManager.getResourceByLabel( schedulerContainer.getNodePartition(), cluster); } - if (!Resources.fitsIn(resourceCalculator, cluster, + if (!Resources.fitsIn(resourceCalculator, Resources.add(queueUsage.getUsed(partition), netAllocated), maxResourceLimit)) { if (LOG.isDebugEnabled()) { 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/allocator/RegularContainerAllocator.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/allocator/RegularContainerAllocator.java index f753d31..2b1fff1 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/allocator/RegularContainerAllocator.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/allocator/RegularContainerAllocator.java @@ -549,7 +549,6 @@ private ContainerAllocation assignContainer(Resource clusterResource, Resources.addTo(availableAndKillable, killableContainer.getAllocatedResource()); if (Resources.fitsIn(rc, - clusterResource, capability, availableAndKillable)) { // Stop if we find enough spaces @@ -580,7 +579,7 @@ private ContainerAllocation assignContainer(Resource clusterResource, resourceNeedToUnReserve = capability; } unreservedContainer = - application.findNodeToUnreserve(clusterResource, node, + application.findNodeToUnreserve(node, schedulerKey, resourceNeedToUnReserve); // When (minimum-unreserved-resource > 0 OR we cannot allocate // new/reserved 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/common/fica/FiCaSchedulerApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java index 17bb104..ab6ec6f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java @@ -314,7 +314,6 @@ private boolean anyContainerInFinalState( } private boolean commonCheckContainerAllocation( - Resource cluster, ContainerAllocationProposal allocation, SchedulerContainer schedulerContainer) { // Make sure node is not reserved by anyone else @@ -355,7 +354,7 @@ private boolean commonCheckContainerAllocation( } } } - if (!Resources.fitsIn(rc, cluster, + if (!Resources.fitsIn(rc, allocation.getAllocatedOrReservedResource(), availableResource)) { if (LOG.isDebugEnabled()) { @@ -419,7 +418,7 @@ public boolean accept(Resource cluster, // Common part of check container allocation regardless if it is a // increase container or regular container - commonCheckContainerAllocation(cluster, allocation, + commonCheckContainerAllocation(allocation, schedulerContainer); } else { // Container reserved first time will be NEW, after the container @@ -723,7 +722,7 @@ public Allocation getAllocation(ResourceCalculator resourceCalculator, @VisibleForTesting public NodeId getNodeIdToUnreserve( SchedulerRequestKey schedulerKey, Resource resourceNeedUnreserve, - ResourceCalculator rc, Resource clusterResource) { + ResourceCalculator rc) { // first go around make this algorithm simple and just grab first // reservation that has enough resources Map reservedContainers = this.reservedContainers.get( @@ -738,7 +737,7 @@ public NodeId getNodeIdToUnreserve( // make sure we unreserve one with at least the same amount of // resources, otherwise could affect capacity limits - if (Resources.fitsIn(rc, clusterResource, resourceNeedUnreserve, + if (Resources.fitsIn(rc, resourceNeedUnreserve, reservedResource)) { if (LOG.isDebugEnabled()) { LOG.debug( @@ -806,14 +805,14 @@ public void reserve(SchedulerRequestKey schedulerKey, FiCaSchedulerNode node, } @VisibleForTesting - public RMContainer findNodeToUnreserve(Resource clusterResource, + public RMContainer findNodeToUnreserve( FiCaSchedulerNode node, SchedulerRequestKey schedulerKey, Resource minimumUnreservedResource) { try { readLock.lock(); // need to unreserve some other container first NodeId idToUnreserve = getNodeIdToUnreserve(schedulerKey, - minimumUnreservedResource, rc, clusterResource); + minimumUnreservedResource, rc); if (idToUnreserve == null) { if (LOG.isDebugEnabled()) { LOG.debug("checked to see if could unreserve for app but nothing " 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/TestReservations.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/TestReservations.java index 5e6548b..9438d85 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/TestReservations.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/TestReservations.java @@ -896,8 +896,7 @@ public void testGetAppToUnreserve() throws Exception { String host_1 = "host_1"; FiCaSchedulerNode node_1 = TestUtils.getMockNode(host_1, DEFAULT_RACK, 0, 8 * GB); - - Resource clusterResource = Resources.createResource(2 * 8 * GB); + // Setup resource-requests Priority p = TestUtils.createMockPriority(5); @@ -935,26 +934,26 @@ public void testGetAppToUnreserve() throws Exception { // no reserved containers NodeId unreserveId = app_0.getNodeIdToUnreserve(priorityMap, capability, - cs.getResourceCalculator(), clusterResource); + cs.getResourceCalculator()); assertEquals(null, unreserveId); // no reserved containers - reserve then unreserve app_0.reserve(node_0, priorityMap, rmContainer_1, container_1); app_0.unreserve(priorityMap, node_0, rmContainer_1); unreserveId = app_0.getNodeIdToUnreserve(priorityMap, capability, - cs.getResourceCalculator(), clusterResource); + cs.getResourceCalculator()); assertEquals(null, unreserveId); // no container large enough is reserved app_0.reserve(node_0, priorityMap, rmContainer_1, container_1); unreserveId = app_0.getNodeIdToUnreserve(priorityMap, capability, - cs.getResourceCalculator(), clusterResource); + cs.getResourceCalculator()); assertEquals(null, unreserveId); // reserve one that is now large enough app_0.reserve(node_1, priorityMap, rmContainer, container); unreserveId = app_0.getNodeIdToUnreserve(priorityMap, capability, - cs.getResourceCalculator(), clusterResource); + cs.getResourceCalculator()); assertEquals(node_1.getNodeID(), unreserveId); } @@ -1002,7 +1001,7 @@ public void testFindNodeToUnreserve() throws Exception { // nothing reserved RMContainer toUnreserveContainer = - app_0.findNodeToUnreserve(csContext.getClusterResource(), node_1, + app_0.findNodeToUnreserve(node_1, priorityMap, capability); assertTrue(toUnreserveContainer == null); @@ -1010,7 +1009,7 @@ public void testFindNodeToUnreserve() throws Exception { app_0.reserve(node_1, priorityMap, rmContainer, container); node_1.reserveResource(app_0, priorityMap, rmContainer); toUnreserveContainer = - app_0.findNodeToUnreserve(csContext.getClusterResource(), node_1, + app_0.findNodeToUnreserve(node_1, priorityMap, capability); assertTrue(toUnreserveContainer == null); }