You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jb...@apache.org on 2021/02/25 20:31:33 UTC
[hadoop] branch branch-2.10 updated: [YARN-10613] Config to allow
Intra- and Inter-queue preemption to enable/disable conservativeDRF.
Contributed by Eric Payne
This is an automated email from the ASF dual-hosted git repository.
jbrennan pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 4ed7b80 [YARN-10613] Config to allow Intra- and Inter-queue preemption to enable/disable conservativeDRF. Contributed by Eric Payne
4ed7b80 is described below
commit 4ed7b80b19c97659996ac655980f748189734f1c
Author: Jim Brennan <jb...@apache.org>
AuthorDate: Thu Feb 25 20:30:42 2021 +0000
[YARN-10613] Config to allow Intra- and Inter-queue preemption to enable/disable conservativeDRF. Contributed by Eric Payne
---
.../CapacitySchedulerPreemptionContext.java | 4 ++
.../monitor/capacity/FifoCandidatesSelector.java | 13 ++--
.../capacity/IntraQueueCandidatesSelector.java | 3 +-
.../ProportionalCapacityPreemptionPolicy.java | 33 ++++++++-
.../capacity/CapacitySchedulerConfiguration.java | 15 ++++
...lCapacityPreemptionPolicyInterQueueWithDRF.java | 75 ++++++++++++++++++++
...lCapacityPreemptionPolicyIntraQueueWithDRF.java | 81 ++++++++++++++++++++++
7 files changed, 217 insertions(+), 7 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/monitor/capacity/CapacitySchedulerPreemptionContext.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/CapacitySchedulerPreemptionContext.java
index d6f3f6c..66b4710 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/CapacitySchedulerPreemptionContext.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/CapacitySchedulerPreemptionContext.java
@@ -68,4 +68,8 @@ interface CapacitySchedulerPreemptionContext {
@Unstable
IntraQueuePreemptionOrderPolicy getIntraQueuePreemptionOrderPolicy();
+
+ boolean getCrossQueuePreemptionConservativeDRF();
+
+ boolean getInQueuePreemptionConservativeDRF();
}
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/FifoCandidatesSelector.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/FifoCandidatesSelector.java
index 5d0ed3f..9a28f9e 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/FifoCandidatesSelector.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/FifoCandidatesSelector.java
@@ -111,7 +111,9 @@ public class FifoCandidatesSelector
.tryPreemptContainerAndDeductResToObtain(rc,
preemptionContext, resToObtainByPartition, c,
clusterResource, selectedCandidates,
- totalPreemptionAllowed, false);
+ totalPreemptionAllowed,
+ preemptionContext.getCrossQueuePreemptionConservativeDRF()
+ );
if (!preempted) {
continue;
}
@@ -187,7 +189,8 @@ public class FifoCandidatesSelector
boolean preempted = CapacitySchedulerPreemptionUtils
.tryPreemptContainerAndDeductResToObtain(rc, preemptionContext,
resToObtainByPartition, c, clusterResource, preemptMap,
- totalPreemptionAllowed, false);
+ totalPreemptionAllowed,
+ preemptionContext.getCrossQueuePreemptionConservativeDRF());
if (preempted) {
Resources.subtractFrom(skippedAMSize, c.getAllocatedResource());
}
@@ -222,7 +225,8 @@ public class FifoCandidatesSelector
// Try to preempt this container
CapacitySchedulerPreemptionUtils.tryPreemptContainerAndDeductResToObtain(
rc, preemptionContext, resToObtainByPartition, c, clusterResource,
- selectedContainers, totalPreemptionAllowed, false);
+ selectedContainers, totalPreemptionAllowed,
+ preemptionContext.getCrossQueuePreemptionConservativeDRF());
if (!preemptionContext.isObserveOnly()) {
preemptionContext.getRMContext().getDispatcher().getEventHandler()
@@ -265,7 +269,8 @@ public class FifoCandidatesSelector
// Try to preempt this container
CapacitySchedulerPreemptionUtils.tryPreemptContainerAndDeductResToObtain(
rc, preemptionContext, resToObtainByPartition, c, clusterResource,
- selectedContainers, totalPreemptionAllowed, false);
+ selectedContainers, totalPreemptionAllowed,
+ preemptionContext.getCrossQueuePreemptionConservativeDRF());
}
}
}
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/IntraQueueCandidatesSelector.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/IntraQueueCandidatesSelector.java
index 8ab9507..5e3fca1 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/IntraQueueCandidatesSelector.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/IntraQueueCandidatesSelector.java
@@ -270,7 +270,8 @@ public class IntraQueueCandidatesSelector extends PreemptionCandidatesSelector {
boolean ret = CapacitySchedulerPreemptionUtils
.tryPreemptContainerAndDeductResToObtain(rc, preemptionContext,
resToObtainByPartition, c, clusterResource, selectedCandidates,
- totalPreemptedResourceAllowed, true);
+ totalPreemptedResourceAllowed,
+ preemptionContext.getInQueuePreemptionConservativeDRF());
// Subtract from respective user's resource usage once a container is
// selected for preemption.
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/ProportionalCapacityPreemptionPolicy.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/ProportionalCapacityPreemptionPolicy.java
index f818499..8a1ab34 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/ProportionalCapacityPreemptionPolicy.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/ProportionalCapacityPreemptionPolicy.java
@@ -109,6 +109,9 @@ public class ProportionalCapacityPreemptionPolicy
private float minimumThresholdForIntraQueuePreemption;
private IntraQueuePreemptionOrderPolicy intraQueuePreemptionOrderPolicy;
+ private boolean crossQueuePreemptionConservativeDRF;
+ private boolean inQueuePreemptionConservativeDRF;
+
// Current configuration
private CapacitySchedulerConfiguration csConfig;
@@ -221,6 +224,18 @@ public class ProportionalCapacityPreemptionPolicy
CapacitySchedulerConfiguration.DEFAULT_INTRAQUEUE_PREEMPTION_ORDER_POLICY)
.toUpperCase());
+ crossQueuePreemptionConservativeDRF = config.getBoolean(
+ CapacitySchedulerConfiguration.
+ CROSS_QUEUE_PREEMPTION_CONSERVATIVE_DRF,
+ CapacitySchedulerConfiguration.
+ DEFAULT_CROSS_QUEUE_PREEMPTION_CONSERVATIVE_DRF);
+
+ inQueuePreemptionConservativeDRF = config.getBoolean(
+ CapacitySchedulerConfiguration.
+ IN_QUEUE_PREEMPTION_CONSERVATIVE_DRF,
+ CapacitySchedulerConfiguration.
+ DEFAULT_IN_QUEUE_PREEMPTION_CONSERVATIVE_DRF);
+
candidatesSelectionPolicies = new ArrayList<>();
// Do we need white queue-priority preemption policy?
@@ -281,7 +296,11 @@ public class ProportionalCapacityPreemptionPolicy
"select_based_on_reserved_containers = " +
selectCandidatesForResevedContainers + "\n" +
"additional_res_balance_based_on_reserved_containers = " +
- additionalPreemptionBasedOnReservedResource);
+ additionalPreemptionBasedOnReservedResource + "\n" +
+ "cross-queue-preemption.conservative-drf = " +
+ crossQueuePreemptionConservativeDRF + "\n" +
+ "in-queue-preemption.conservative-drf = " +
+ inQueuePreemptionConservativeDRF);
csConfig = config;
}
@@ -392,7 +411,7 @@ public class ProportionalCapacityPreemptionPolicy
return leafQueueNames;
}
-
+
/**
* This method selects and tracks containers to be preemptionCandidates. If a container
* is in the target list for more than maxWaitTime it is killed.
@@ -727,4 +746,14 @@ public class ProportionalCapacityPreemptionPolicy
public IntraQueuePreemptionOrderPolicy getIntraQueuePreemptionOrderPolicy() {
return intraQueuePreemptionOrderPolicy;
}
+
+ @Override
+ public boolean getCrossQueuePreemptionConservativeDRF() {
+ return crossQueuePreemptionConservativeDRF;
+ }
+
+ @Override
+ public boolean getInQueuePreemptionConservativeDRF() {
+ return inQueuePreemptionConservativeDRF;
+ }
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
index f8b146f..591b1c7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacitySchedulerConfiguration.java
@@ -1317,6 +1317,21 @@ public class CapacitySchedulerConfiguration extends ReservationSchedulerConfigur
public static final String DEFAULT_INTRAQUEUE_PREEMPTION_ORDER_POLICY = "userlimit_first";
/**
+ * Flag to determine whether or not to preempt containers from apps where some
+ * used resources are less than the user's user limit.
+ */
+ public static final String CROSS_QUEUE_PREEMPTION_CONSERVATIVE_DRF =
+ PREEMPTION_CONFIG_PREFIX + "conservative-drf";
+ public static final Boolean DEFAULT_CROSS_QUEUE_PREEMPTION_CONSERVATIVE_DRF =
+ false;
+
+ public static final String IN_QUEUE_PREEMPTION_CONSERVATIVE_DRF =
+ PREEMPTION_CONFIG_PREFIX + INTRA_QUEUE_PREEMPTION_CONFIG_PREFIX +
+ "conservative-drf";
+ public static final Boolean DEFAULT_IN_QUEUE_PREEMPTION_CONSERVATIVE_DRF =
+ true;
+
+ /**
* Maximum application for a queue to be used when application per queue is
* not defined.To be consistent with previous version the default value is set
* as UNDEFINED.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyInterQueueWithDRF.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyInterQueueWithDRF.java
index 42b31a5..dde1dd6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyInterQueueWithDRF.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyInterQueueWithDRF.java
@@ -20,7 +20,10 @@ package org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity;
import java.io.IOException;
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.server.resourcemanager.scheduler.capacity.LeafQueue;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.SchedulingMode;
import org.apache.hadoop.yarn.util.resource.ResourceUtils;
import org.apache.hadoop.yarn.util.resource.DominantResourceCalculator;
@@ -28,8 +31,10 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+import static org.mockito.Matchers.any;
import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -173,4 +178,74 @@ public class TestProportionalCapacityPreemptionPolicyInterQueueWithDRF
new TestProportionalCapacityPreemptionPolicy.IsPreemptionRequestFor(
getAppAttemptId(2))));
}
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testInterQueuePreemptionWithStrictAndRelaxedDRF()
+ throws IOException {
+
+ /*
+ * root
+ * / \ \
+ * a b c
+ *
+ * A / B / C have 33.3 / 33.3 / 33.4 resources
+ * Total cluster resource have mem=61440, cpu=600
+ *
+ * +=================+========================+
+ * | used in queue a | user limit for queue a |
+ * +=================+========================+
+ * | 61440:60 | 20480:200 |
+ * +=================+========================+
+ * In this case, the used memory is over the user limit but the used vCores
+ * is not. If conservative DRF is true, preemptions will not occur.
+ * If conservative DRF is false (default) preemptions will occur.
+ */
+ String labelsConfig = "=61440:600,true;";
+ String nodesConfig = "n1= res=61440:600"; // n1 is default partition
+ String queuesConfig =
+ // guaranteed,max,used,pending,reserved
+ "root(=[61440:600 61440:600 61440:600 20480:20 0]);" + // root
+ "-a(=[20480:200 61440:600 61440:60 0:0 0]);" + // b
+ "-b(=[20480:200 61440:600 0:0 20480:20 0]);" + // a
+ "-c(=[20480:200 61440:600 0:0 0:0 0])"; // c
+ String appsConfig =
+ //queueName\t(priority,resource,host,expression,#repeat,reserved)
+ "a\t" + "(1,1024:1,n1,,60,false,0:0,user1);" + // app1 in a
+ "b\t" + "(1,0:0,n1,,0,false,20480:20,user2);"; // app2 in b
+
+ conf.setBoolean(
+ CapacitySchedulerConfiguration.CROSS_QUEUE_PREEMPTION_CONSERVATIVE_DRF,
+ true);
+
+ buildEnv(labelsConfig, nodesConfig, queuesConfig, appsConfig);
+ Resource ul = Resource.newInstance(20480, 20);
+ when(((LeafQueue)(cs.getQueue("a")))
+ .getResourceLimitForAllUsers(any(String.class), any(Resource.class),
+ any(String.class), any(SchedulingMode.class))
+ ).thenReturn(ul);
+ policy.editSchedule();
+
+ verify(mDisp, times(0)).handle(argThat(
+ new TestProportionalCapacityPreemptionPolicy.IsPreemptionRequestFor(
+ getAppAttemptId(1))));
+
+ reset(mDisp);
+
+ conf.setBoolean(
+ CapacitySchedulerConfiguration.CROSS_QUEUE_PREEMPTION_CONSERVATIVE_DRF,
+ false);
+
+ buildEnv(labelsConfig, nodesConfig, queuesConfig, appsConfig);
+ ul = Resource.newInstance(20480, 20);
+ when(((LeafQueue)(cs.getQueue("a")))
+ .getResourceLimitForAllUsers(any(String.class), any(Resource.class),
+ any(String.class), any(SchedulingMode.class))
+ ).thenReturn(ul);
+ policy.editSchedule();
+
+ verify(mDisp, times(20)).handle(argThat(
+ new TestProportionalCapacityPreemptionPolicy.IsPreemptionRequestFor(
+ getAppAttemptId(1))));
+ }
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyIntraQueueWithDRF.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyIntraQueueWithDRF.java
index 7784549..bcc1f9c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyIntraQueueWithDRF.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/TestProportionalCapacityPreemptionPolicyIntraQueueWithDRF.java
@@ -18,15 +18,20 @@
package org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity;
+import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.LeafQueue;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.SchedulingMode;
import org.apache.hadoop.yarn.util.resource.DominantResourceCalculator;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
+import static org.mockito.Matchers.any;
import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -110,6 +115,82 @@ public class TestProportionalCapacityPreemptionPolicyIntraQueueWithDRF
getAppAttemptId(3))));
}
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testIntraQueuePreemptionFairOrderingWithStrictAndRelaxedDRF()
+ throws IOException {
+ /**
+ * Continue to allow intra-queue preemption when only one of the user's
+ * resources is above the user limit.
+ * Queue structure is:
+ *
+ * <pre>
+ * root
+ * / |
+ * a b
+ * </pre>
+ *
+ * Guaranteed resource of a and b are 30720:300 and 30720:300 Total cluster
+ * resource = 61440:600.
+ * Scenario: Queue B has one running app using 61720:60 resources with no
+ * pending resources, and one app with no used resources and 30720:30
+ * pending resources.
+ *
+ * The first part of the test is to show what happens when the conservative
+ * DRF property is set. Since the memory is above and the vcores is below
+ * the user limit, only the minimum number of containers is allowed.
+ * In the second part, since conservative DRF is relaxed, all containers
+ * needed are allowed to be preempted (minus the AM size).
+ */
+
+ conf.set(CapacitySchedulerConfiguration.INTRAQUEUE_PREEMPTION_ORDER_POLICY,
+ "userlimit_first");
+ conf.set(CapacitySchedulerConfiguration.PREFIX
+ + "root.b." + CapacitySchedulerConfiguration.ORDERING_POLICY, "fair");
+ conf.setBoolean(
+ CapacitySchedulerConfiguration.IN_QUEUE_PREEMPTION_CONSERVATIVE_DRF,
+ true);
+
+ String labelsConfig = "=61440:600,true;";
+ String nodesConfig = // n1 has no label
+ "n1= res=61440:600";
+ String queuesConfig =
+ // guaranteed,max,used,pending,reserved
+ "root(=[61440:600 61440:600 61440:600 30720:30 0]);" + // root
+ "-a(=[30720:300 61440:600 0:0 0:0 0]);" + // a
+ "-b(=[30720:300 61440:600 61440:60 30720:30 0]);"; // b
+
+ String appsConfig =
+ "b\t" + "(1,1024:1,n1,,60,false,0:0,user1);" + // app1 in b
+ "b\t" + "(1,0:0,n1,,0,false,30720:30,user3);"; // app2 in b
+
+ buildEnv(labelsConfig, nodesConfig, queuesConfig, appsConfig);
+ Resource ul = Resource.newInstance(30720, 300);
+ when(((LeafQueue)(cs.getQueue("b")))
+ .getResourceLimitForAllUsers(any(String.class), any(Resource.class),
+ any(String.class), any(SchedulingMode.class))
+ ).thenReturn(ul);
+ policy.editSchedule();
+
+ verify(mDisp, times(6)).handle(argThat(
+ new TestProportionalCapacityPreemptionPolicy.IsPreemptionRequestFor(
+ getAppAttemptId(1))));
+ reset(mDisp);
+
+ conf.setBoolean(
+ CapacitySchedulerConfiguration.IN_QUEUE_PREEMPTION_CONSERVATIVE_DRF,
+ false);
+ buildEnv(labelsConfig, nodesConfig, queuesConfig, appsConfig);
+ when(((LeafQueue)(cs.getQueue("b")))
+ .getResourceLimitForAllUsers(any(String.class), any(Resource.class),
+ any(String.class), any(SchedulingMode.class))
+ ).thenReturn(ul);
+ policy.editSchedule();
+ verify(mDisp, times(29)).handle(argThat(
+ new TestProportionalCapacityPreemptionPolicy.IsPreemptionRequestFor(
+ getAppAttemptId(1))));
+ }
+
@Test
public void testIntraQueuePreemptionWithDominantVCoreResource()
throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org