From dbbfcf74ab44d7bfdc805b63affd0defc57182b8 Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Fri, 17 Feb 2017 14:07:31 -0800 Subject: [PATCH] YARN-6193. FairScheduler might not trigger preemption when using DRF. (kasha) --- .../scheduler/fair/FSAppAttempt.java | 9 +++-- .../fair/TestFairSchedulerPreemption.java | 36 +++++++++++++------ 2 files changed, 30 insertions(+), 15 deletions(-) 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/FSAppAttempt.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/FSAppAttempt.java index b1bb9a09b0a..6ed06609f4d 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/FSAppAttempt.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/FSAppAttempt.java @@ -602,12 +602,11 @@ public class FSAppAttempt extends SchedulerApplicationAttempt // Check if the app's allocation will be over its fairshare even // after preempting this container - Resource currentUsage = getResourceUsage(); - Resource fairshare = getFairShare(); - Resource overFairShareBy = Resources.subtract(currentUsage, fairshare); + Resource usageAfterPreemption = Resources.subtract( + getResourceUsage(), container.getAllocatedResource()); - return (Resources.fitsIn(container.getAllocatedResource(), - overFairShareBy)); + return !Resources.lessThan(fsQueue.getPolicy().getResourceCalculator(), + scheduler.getClusterResource(), usageAfterPreemption, getFairShare()); } /** 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/TestFairSchedulerPreemption.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/TestFairSchedulerPreemption.java index a4d69bf2214..480a329771c 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/TestFairSchedulerPreemption.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/TestFairSchedulerPreemption.java @@ -57,6 +57,7 @@ public class TestFairSchedulerPreemption extends FairSchedulerTestBase { private static final int NODE_CAPACITY_MULTIPLE = 4; private final boolean fairsharePreemption; + private final boolean drf; // App that takes up the entire cluster private FSAppAttempt greedyApp; @@ -67,13 +68,17 @@ public class TestFairSchedulerPreemption extends FairSchedulerTestBase { @Parameterized.Parameters(name = "{0}") public static Collection getParameters() { return Arrays.asList(new Object[][] { - {"FairSharePreemption", true}, - {"MinSharePreemption", false}}); + {"MinSharePreemption", 0}, + {"MinSharePreemptionWithDRF", 1}, + {"FairSharePreemption", 2}, + {"FairSharePreemptionWithDRF", 3} + }); } - public TestFairSchedulerPreemption(String name, boolean fairshare) + public TestFairSchedulerPreemption(String name, int mode) throws IOException { - fairsharePreemption = fairshare; + fairsharePreemption = (mode > 1); // 2 and 3 + drf = (mode % 2 == 1); // 1 and 3 writeAllocFile(); } @@ -146,6 +151,10 @@ public class TestFairSchedulerPreemption extends FairSchedulerTestBase { out.println(""); // end of nonpreemptable queue + if (drf) { + out.println("drf" + + ""); + } out.println(""); out.close(); @@ -177,9 +186,14 @@ public class TestFairSchedulerPreemption extends FairSchedulerTestBase { scheduler.setClock(clock); resourceManager.start(); - // Create and add two nodes to the cluster - addNode(NODE_CAPACITY_MULTIPLE * GB, NODE_CAPACITY_MULTIPLE); - addNode(NODE_CAPACITY_MULTIPLE * GB, NODE_CAPACITY_MULTIPLE); + // Create and add two nodes to the cluster, with capacities + // disproportional to the container requests. + addNode(NODE_CAPACITY_MULTIPLE * GB, 3 * NODE_CAPACITY_MULTIPLE); + addNode(NODE_CAPACITY_MULTIPLE * GB, 3 * NODE_CAPACITY_MULTIPLE); + + // Reinitialize the scheduler so DRF policy picks up cluster capacity + // TODO (YARN-6194): One shouldn't need to call this + scheduler.reinitialize(conf, resourceManager.getRMContext()); // Verify if child-1 and child-2 are preemptable FSQueue child1 = @@ -257,7 +271,7 @@ public class TestFairSchedulerPreemption extends FairSchedulerTestBase { private void verifyPreemption() throws InterruptedException { // Sleep long enough for four containers to be preempted. - for (int i = 0; i < 100; i++) { + for (int i = 0; i < 1000; i++) { if (greedyApp.getLiveContainers().size() == 4) { break; } @@ -265,12 +279,14 @@ public class TestFairSchedulerPreemption extends FairSchedulerTestBase { } // Verify the right amount of containers are preempted from greedyApp - assertEquals(4, greedyApp.getLiveContainers().size()); + assertEquals("Incorrect number of containers on the greedy app", + 4, greedyApp.getLiveContainers().size()); sendEnoughNodeUpdatesToAssignFully(); // Verify the preempted containers are assigned to starvingApp - assertEquals(2, starvingApp.getLiveContainers().size()); + assertEquals("Starved app is not assigned the right number of containers", + 2, starvingApp.getLiveContainers().size()); } private void verifyNoPreemption() throws InterruptedException {