Repository: hadoop Updated Branches: refs/heads/branch-3.0 2f3415a4d -> 55ded7071
Revert "YARN-7813: Capacity Scheduler Intra-queue Preemption should be configurable for each queue" This reverts commit 36c9dda07f9d0ac14f0c979c7d519536fc9b3d28. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/55ded707 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/55ded707 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/55ded707 Branch: refs/heads/branch-3.0 Commit: 55ded70716eb2754bafd9c06ee38b92df75d3ccd Parents: 2f3415a Author: Eric Payne <epa...@apache.org> Authored: Wed Feb 14 14:38:31 2018 -0600 Committer: Eric Payne <epa...@apache.org> Committed: Wed Feb 14 14:38:31 2018 -0600 ---------------------------------------------------------------------- .../hadoop/yarn/api/records/QueueInfo.java | 35 ------- .../src/main/proto/yarn_protos.proto | 1 - .../apache/hadoop/yarn/client/cli/QueueCLI.java | 6 -- .../hadoop/yarn/client/ProtocolHATestBase.java | 3 +- .../hadoop/yarn/client/cli/TestYarnCLI.java | 96 ++------------------ .../api/records/impl/pb/QueueInfoPBImpl.java | 13 --- .../hadoop/yarn/api/TestPBImplRecords.java | 2 +- .../capacity/IntraQueueCandidatesSelector.java | 4 +- .../scheduler/capacity/AbstractCSQueue.java | 67 ++------------ .../scheduler/capacity/CSQueue.java | 16 +--- .../CapacitySchedulerConfiguration.java | 15 --- .../webapp/CapacitySchedulerPage.java | 5 +- .../dao/CapacitySchedulerLeafQueueInfo.java | 6 -- .../TestConfigurationMutationACLPolicies.java | 2 +- .../TestSchedulerApplicationAttempt.java | 2 +- .../scheduler/capacity/TestLeafQueue.java | 2 +- .../webapp/TestRMWebServicesCapacitySched.java | 2 +- .../src/site/markdown/CapacityScheduler.md | 3 +- 18 files changed, 26 insertions(+), 254 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java index 57ea9bf..897b442 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/QueueInfo.java @@ -94,26 +94,6 @@ public abstract class QueueInfo { return queueInfo; } - @Private - @Unstable - public static QueueInfo newInstance(String queueName, float capacity, - float maximumCapacity, float currentCapacity, - List<QueueInfo> childQueues, List<ApplicationReport> applications, - QueueState queueState, Set<String> accessibleNodeLabels, - String defaultNodeLabelExpression, QueueStatistics queueStatistics, - boolean preemptionDisabled, - Map<String, QueueConfigurations> queueConfigurations, - boolean intraQueuePreemptionDisabled) { - QueueInfo queueInfo = QueueInfo.newInstance(queueName, capacity, - maximumCapacity, currentCapacity, - childQueues, applications, - queueState, accessibleNodeLabels, - defaultNodeLabelExpression, queueStatistics, - preemptionDisabled, queueConfigurations); - queueInfo.setIntraQueuePreemptionDisabled(intraQueuePreemptionDisabled); - return queueInfo; - } - /** * Get the <em>name</em> of the queue. * @return <em>name</em> of the queue @@ -281,19 +261,4 @@ public abstract class QueueInfo { @Unstable public abstract void setQueueConfigurations( Map<String, QueueConfigurations> queueConfigurations); - - - /** - * Get the intra-queue preemption status of the queue. - * @return if property is not in proto, return null; - * otherwise, return intra-queue preemption status of the queue - */ - @Public - @Stable - public abstract Boolean getIntraQueuePreemptionDisabled(); - - @Private - @Unstable - public abstract void setIntraQueuePreemptionDisabled( - boolean intraQueuePreemptionDisabled); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto index d2b3810..c53b90e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto @@ -528,7 +528,6 @@ message QueueInfoProto { optional QueueStatisticsProto queueStatistics = 10; optional bool preemptionDisabled = 11; repeated QueueConfigurationsMapProto queueConfigurationsMap = 12; - optional bool intraQueuePreemptionDisabled = 13; } message QueueConfigurationsProto { http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java index 2c3dfd0..330b081 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java @@ -158,11 +158,5 @@ public class QueueCLI extends YarnCLI { writer.print("\tPreemption : "); writer.println(preemptStatus ? "disabled" : "enabled"); } - - Boolean intraQueuePreemption = queueInfo.getIntraQueuePreemptionDisabled(); - if (intraQueuePreemption != null) { - writer.print("\tIntra-queue Preemption : "); - writer.println(intraQueuePreemption ? "disabled" : "enabled"); - } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java index 7937b15..54537ce 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/ProtocolHATestBase.java @@ -665,8 +665,7 @@ public abstract class ProtocolHATestBase extends ClientBaseWithFixes { public QueueInfo createFakeQueueInfo() { return QueueInfo.newInstance("root", 100f, 100f, 50f, null, - createFakeAppReports(), QueueState.RUNNING, null, null, null, false, - null, false); + createFakeAppReports(), QueueState.RUNNING, null, null, null, false); } public List<QueueUserACLInfo> createFakeQueueUserACLInfoList() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java index d71bf8d..2024459 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java @@ -1712,8 +1712,7 @@ public class TestYarnCLI { nodeLabels.add("GPU"); nodeLabels.add("JDK_7"); QueueInfo queueInfo = QueueInfo.newInstance("queueA", 0.4f, 0.8f, 0.5f, - null, null, QueueState.RUNNING, nodeLabels, "GPU", null, false, null, - false); + null, null, QueueState.RUNNING, nodeLabels, "GPU", null, false, null); when(client.getQueueInfo(any(String.class))).thenReturn(queueInfo); int result = cli.run(new String[] { "-status", "queueA" }); assertEquals(0, result); @@ -1729,83 +1728,12 @@ public class TestYarnCLI { pw.println("\tDefault Node Label expression : " + "GPU"); pw.println("\tAccessible Node Labels : " + "JDK_7,GPU"); pw.println("\tPreemption : " + "enabled"); - pw.println("\tIntra-queue Preemption : " + "enabled"); pw.close(); String queueInfoStr = baos.toString("UTF-8"); Assert.assertEquals(queueInfoStr, sysOutStream.toString()); } @Test - public void testGetQueueInfoOverrideIntraQueuePreemption() throws Exception { - CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); - ReservationSystemTestUtil.setupQueueConfiguration(conf); - conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class, - ResourceScheduler.class); - conf.setBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true); - conf.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, - "org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity." - + "ProportionalCapacityPreemptionPolicy"); - // Turn on cluster-wide intra-queue preemption - conf.setBoolean( - CapacitySchedulerConfiguration.INTRAQUEUE_PREEMPTION_ENABLED, true); - // Disable intra-queue preemption for all queues - conf.setBoolean(CapacitySchedulerConfiguration.PREFIX - + "root.intra-queue-preemption.disable_preemption", true); - // Enable intra-queue preemption for the a1 queue - conf.setBoolean(CapacitySchedulerConfiguration.PREFIX - + "root.a.a1.intra-queue-preemption.disable_preemption", false); - MiniYARNCluster cluster = - new MiniYARNCluster("testGetQueueInfoOverrideIntraQueuePreemption", - 2, 1, 1); - - YarnClient yarnClient = null; - try { - cluster.init(conf); - cluster.start(); - final Configuration yarnConf = cluster.getConfig(); - yarnClient = YarnClient.createYarnClient(); - yarnClient.init(yarnConf); - yarnClient.start(); - - QueueCLI cli = new QueueCLI(); - cli.setClient(yarnClient); - cli.setSysOutPrintStream(sysOut); - cli.setSysErrPrintStream(sysErr); - sysOutStream.reset(); - // Get status for the root.a queue - int result = cli.run(new String[] { "-status", "a" }); - assertEquals(0, result); - String queueStatusOut = sysOutStream.toString(); - Assert.assertTrue(queueStatusOut - .contains("\tPreemption : enabled")); - // In-queue preemption is disabled at the "root.a" queue level - Assert.assertTrue(queueStatusOut - .contains("Intra-queue Preemption : disabled")); - cli = new QueueCLI(); - cli.setClient(yarnClient); - cli.setSysOutPrintStream(sysOut); - cli.setSysErrPrintStream(sysErr); - sysOutStream.reset(); - // Get status for the root.a.a1 queue - result = cli.run(new String[] { "-status", "a1" }); - assertEquals(0, result); - queueStatusOut = sysOutStream.toString(); - Assert.assertTrue(queueStatusOut - .contains("\tPreemption : enabled")); - // In-queue preemption is enabled at the "root.a.a1" queue level - Assert.assertTrue(queueStatusOut - .contains("Intra-queue Preemption : enabled")); - } finally { - // clean-up - if (yarnClient != null) { - yarnClient.stop(); - } - cluster.stop(); - cluster.close(); - } - } - - @Test public void testGetQueueInfoPreemptionEnabled() throws Exception { CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); ReservationSystemTestUtil.setupQueueConfiguration(conf); @@ -1815,10 +1743,9 @@ public class TestYarnCLI { conf.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, "org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity." + "ProportionalCapacityPreemptionPolicy"); - conf.setBoolean( - CapacitySchedulerConfiguration.INTRAQUEUE_PREEMPTION_ENABLED, true); + conf.setBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true); MiniYARNCluster cluster = - new MiniYARNCluster("testGetQueueInfoPreemptionEnabled", 2, 1, 1); + new MiniYARNCluster("testReservationAPIs", 2, 1, 1); YarnClient yarnClient = null; try { @@ -1836,11 +1763,8 @@ public class TestYarnCLI { sysOutStream.reset(); int result = cli.run(new String[] { "-status", "a1" }); assertEquals(0, result); - String queueStatusOut = sysOutStream.toString(); - Assert.assertTrue(queueStatusOut - .contains("\tPreemption : enabled")); - Assert.assertTrue(queueStatusOut - .contains("Intra-queue Preemption : enabled")); + Assert.assertTrue(sysOutStream.toString() + .contains("Preemption : enabled")); } finally { // clean-up if (yarnClient != null) { @@ -1880,11 +1804,8 @@ public class TestYarnCLI { sysOutStream.reset(); int result = cli.run(new String[] { "-status", "a1" }); assertEquals(0, result); - String queueStatusOut = sysOutStream.toString(); - Assert.assertTrue(queueStatusOut - .contains("\tPreemption : disabled")); - Assert.assertTrue(queueStatusOut - .contains("Intra-queue Preemption : disabled")); + Assert.assertTrue(sysOutStream.toString() + .contains("Preemption : disabled")); } } @@ -1892,7 +1813,7 @@ public class TestYarnCLI { public void testGetQueueInfoWithEmptyNodeLabel() throws Exception { QueueCLI cli = createAndGetQueueCLI(); QueueInfo queueInfo = QueueInfo.newInstance("queueA", 0.4f, 0.8f, 0.5f, - null, null, QueueState.RUNNING, null, null, null, true, null, true); + null, null, QueueState.RUNNING, null, null, null, true, null); when(client.getQueueInfo(any(String.class))).thenReturn(queueInfo); int result = cli.run(new String[] { "-status", "queueA" }); assertEquals(0, result); @@ -1909,7 +1830,6 @@ public class TestYarnCLI { + NodeLabel.DEFAULT_NODE_LABEL_PARTITION); pw.println("\tAccessible Node Labels : "); pw.println("\tPreemption : " + "disabled"); - pw.println("\tIntra-queue Preemption : " + "disabled"); pw.close(); String queueInfoStr = baos.toString("UTF-8"); Assert.assertEquals(queueInfoStr, sysOutStream.toString()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java index f735139..1d2a6dd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/QueueInfoPBImpl.java @@ -500,17 +500,4 @@ public class QueueInfoPBImpl extends QueueInfo { this.queueConfigurations.putAll(queueConfigurations); } - @Override - public Boolean getIntraQueuePreemptionDisabled() { - QueueInfoProtoOrBuilder p = viaProto ? proto : builder; - return (p.hasIntraQueuePreemptionDisabled()) ? p - .getIntraQueuePreemptionDisabled() : null; - } - - @Override - public void setIntraQueuePreemptionDisabled( - boolean intraQueuePreemptionDisabled) { - maybeInitBuilder(); - builder.setIntraQueuePreemptionDisabled(intraQueuePreemptionDisabled); - } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java index 40f324f..8c6312e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/TestPBImplRecords.java @@ -397,7 +397,7 @@ public class TestPBImplRecords extends BasePBImplRecordsTest { // it is recursive(has sub queues) typeValueCache.put(QueueInfo.class, QueueInfo.newInstance("root", 1.0f, 1.0f, 0.1f, null, null, QueueState.RUNNING, ImmutableSet.of("x", "y"), - "x && y", null, false, null, false)); + "x && y", null, false)); generateByNewInstance(QueueStatistics.class); generateByNewInstance(QueueUserACLInfo.class); generateByNewInstance(YarnClusterMetrics.class); http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/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 ---------------------------------------------------------------------- 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 5b6932e..44fa736 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 @@ -114,8 +114,8 @@ public class IntraQueueCandidatesSelector extends PreemptionCandidatesSelector { continue; } - // Don't preempt if intra-queue preemption is disabled for this queue. - if (leafQueue.getIntraQueuePreemptionDisabled()) { + // Don't preempt if disabled for this queue. + if (leafQueue.getPreemptionDisabled()) { continue; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/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 ---------------------------------------------------------------------- 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 fdb57d9..183cb36 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 @@ -94,9 +94,6 @@ public abstract class AbstractCSQueue implements CSQueue { new HashMap<AccessType, AccessControlList>(); volatile boolean reservationsContinueLooking; private volatile boolean preemptionDisabled; - // Indicates if the in-queue preemption setting is ever disabled within the - // hierarchy of this queue. - private boolean intraQueuePreemptionDisabledInHierarchy; // Track resource usage-by-label like used-resource/pending-resource, etc. volatile ResourceUsage queueUsage; @@ -342,8 +339,6 @@ public abstract class AbstractCSQueue implements CSQueue { csContext.getConfiguration().getReservationContinueLook(); this.preemptionDisabled = isQueueHierarchyPreemptionDisabled(this); - this.intraQueuePreemptionDisabledInHierarchy = - isIntraQueueHierarchyPreemptionDisabled(this); this.priority = csContext.getConfiguration().getQueuePriority( getQueuePath()); @@ -434,8 +429,6 @@ public abstract class AbstractCSQueue implements CSQueue { queueInfo.setCurrentCapacity(getUsedCapacity()); queueInfo.setQueueStatistics(getQueueStatistics()); queueInfo.setPreemptionDisabled(preemptionDisabled); - queueInfo.setIntraQueuePreemptionDisabled( - getIntraQueuePreemptionDisabled()); queueInfo.setQueueConfigurations(getQueueConfigurations()); return queueInfo; } @@ -550,16 +543,6 @@ public abstract class AbstractCSQueue implements CSQueue { public boolean getPreemptionDisabled() { return preemptionDisabled; } - - @Private - public boolean getIntraQueuePreemptionDisabled() { - return intraQueuePreemptionDisabledInHierarchy || preemptionDisabled; - } - - @Private - public boolean getIntraQueuePreemptionDisabledInHierarchy() { - return intraQueuePreemptionDisabledInHierarchy; - } @Private public QueueCapacities getQueueCapacities() { @@ -577,13 +560,12 @@ public abstract class AbstractCSQueue implements CSQueue { } /** - * The specified queue is cross-queue preemptable if system-wide cross-queue - * preemption is turned on unless any queue in the <em>qPath</em> hierarchy - * has explicitly turned cross-queue preemption off. - * NOTE: Cross-queue preemptability is inherited from a queue's parent. - * - * @param q queue to check preemption state - * @return true if queue has cross-queue preemption disabled, false otherwise + * The specified queue is preemptable if system-wide preemption is turned on + * unless any queue in the <em>qPath</em> hierarchy has explicitly turned + * preemption off. + * NOTE: Preemptability is inherited from a queue's parent. + * + * @return true if queue has preemption disabled, false otherwise */ private boolean isQueueHierarchyPreemptionDisabled(CSQueue q) { CapacitySchedulerConfiguration csConf = csContext.getConfiguration(); @@ -610,42 +592,7 @@ public abstract class AbstractCSQueue implements CSQueue { return csConf.getPreemptionDisabled(q.getQueuePath(), parentQ.getPreemptionDisabled()); } - - /** - * The specified queue is intra-queue preemptable if - * 1) system-wide intra-queue preemption is turned on - * 2) no queue in the <em>qPath</em> hierarchy has explicitly turned off intra - * queue preemption. - * NOTE: Intra-queue preemptability is inherited from a queue's parent. - * - * @param q queue to check intra-queue preemption state - * @return true if queue has intra-queue preemption disabled, false otherwise - */ - private boolean isIntraQueueHierarchyPreemptionDisabled(CSQueue q) { - CapacitySchedulerConfiguration csConf = csContext.getConfiguration(); - boolean systemWideIntraQueuePreemption = - csConf.getBoolean( - CapacitySchedulerConfiguration.INTRAQUEUE_PREEMPTION_ENABLED, - CapacitySchedulerConfiguration - .DEFAULT_INTRAQUEUE_PREEMPTION_ENABLED); - // Intra-queue preemption is disabled for this queue if the system-wide - // intra-queue preemption flag is false - if (!systemWideIntraQueuePreemption) return true; - - // Check if this is the root queue and the root queue's intra-queue - // preemption disable switch is set - CSQueue parentQ = q.getParent(); - if (parentQ == null) { - return csConf.getIntraQueuePreemptionDisabled(q.getQueuePath(), false); - } - - // At this point, the master preemption switch is enabled down to this - // queue's level. Determine whether or not intra-queue preemption is enabled - // down to this queu's level and return that value. - return csConf.getIntraQueuePreemptionDisabled(q.getQueuePath(), - parentQ.getIntraQueuePreemptionDisabledInHierarchy()); - } - + private Resource getCurrentLimitResource(String nodePartition, Resource clusterResource, ResourceLimits currentResourceLimits, SchedulingMode schedulingMode) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CSQueue.java ---------------------------------------------------------------------- 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/CSQueue.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/CSQueue.java index 62abfbd..43e7f53 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/CSQueue.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/CSQueue.java @@ -273,21 +273,7 @@ public interface CSQueue extends SchedulerQueue<CSQueue> { * @return true if <em>disable_preemption</em> is set, false if not */ public boolean getPreemptionDisabled(); - - /** - * Check whether intra-queue preemption is disabled for this queue - * @return true if either intra-queue preemption or inter-queue preemption - * is disabled for this queue, false if neither is disabled. - */ - public boolean getIntraQueuePreemptionDisabled(); - - /** - * Determines whether or not the intra-queue preemption disabled switch is set - * at any level in this queue's hierarchy. - * @return state of the intra-queue preemption switch at this queue level - */ - public boolean getIntraQueuePreemptionDisabledInHierarchy(); - + /** * Get QueueCapacities of this queue * @return queueCapacities http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/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 ---------------------------------------------------------------------- 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 1e22e0b..bfead35 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 @@ -1117,21 +1117,6 @@ public class CapacitySchedulerConfiguration extends ReservationSchedulerConfigur } /** - * Indicates whether intra-queue preemption is disabled on the specified queue - * - * @param queue queue path to query - * @param defaultVal used as default if the property is not set in the - * configuration - * @return true if preemption is disabled on queue, false otherwise - */ - public boolean getIntraQueuePreemptionDisabled(String queue, - boolean defaultVal) { - return - getBoolean(getQueuePrefix(queue) + INTRA_QUEUE_PREEMPTION_CONFIG_PREFIX - + QUEUE_PREEMPTION_DISABLED, defaultVal); - } - - /** * Get configured node labels in a given queuePath */ public Set<String> getConfiguredNodeLabels(String queuePath) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java ---------------------------------------------------------------------- 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/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index f2156fc..1ed15b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java @@ -183,10 +183,7 @@ class CapacitySchedulerPage extends RmView { __("Configured User Limit Factor:", lqinfo.getUserLimitFactor()). __("Accessible Node Labels:", StringUtils.join(",", lqinfo.getNodeLabels())). __("Ordering Policy: ", lqinfo.getOrderingPolicyInfo()). - __("Preemption:", - lqinfo.getPreemptionDisabled() ? "disabled" : "enabled"). - __("Intra-queue Preemption:", lqinfo.getIntraQueuePreemptionDisabled() - ? "disabled" : "enabled"). + __("Preemption:", lqinfo.getPreemptionDisabled() ? "disabled" : "enabled"). __("Default Node Label Expression:", lqinfo.getDefaultNodeLabelExpression() == null ? NodeLabel.DEFAULT_NODE_LABEL_PARTITION http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerLeafQueueInfo.java ---------------------------------------------------------------------- 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/CapacitySchedulerLeafQueueInfo.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/CapacitySchedulerLeafQueueInfo.java index c3b56c1..7dcdf58 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/CapacitySchedulerLeafQueueInfo.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/CapacitySchedulerLeafQueueInfo.java @@ -46,7 +46,6 @@ public class CapacitySchedulerLeafQueueInfo extends CapacitySchedulerQueueInfo { protected ResourceInfo usedAMResource; protected ResourceInfo userAMResourceLimit; protected boolean preemptionDisabled; - protected boolean intraQueuePreemptionDisabled; protected String defaultNodeLabelExpression; protected int defaultPriority; @@ -69,7 +68,6 @@ public class CapacitySchedulerLeafQueueInfo extends CapacitySchedulerQueueInfo { AMResourceLimit = new ResourceInfo(q.getAMResourceLimit()); usedAMResource = new ResourceInfo(q.getQueueResourceUsage().getAMUsed()); preemptionDisabled = q.getPreemptionDisabled(); - intraQueuePreemptionDisabled = q.getIntraQueuePreemptionDisabled(); orderingPolicyInfo = q.getOrderingPolicy().getInfo(); defaultNodeLabelExpression = q.getDefaultNodeLabelExpression(); defaultPriority = q.getDefaultApplicationPriority().getPriority(); @@ -143,10 +141,6 @@ public class CapacitySchedulerLeafQueueInfo extends CapacitySchedulerQueueInfo { public boolean getPreemptionDisabled() { return preemptionDisabled; } - - public boolean getIntraQueuePreemptionDisabled() { - return intraQueuePreemptionDisabled; - } public String getOrderingPolicyInfo() { return orderingPolicyInfo; http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestConfigurationMutationACLPolicies.java ---------------------------------------------------------------------- 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/TestConfigurationMutationACLPolicies.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestConfigurationMutationACLPolicies.java index 9a23c1d..398e909 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestConfigurationMutationACLPolicies.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestConfigurationMutationACLPolicies.java @@ -67,7 +67,7 @@ public class TestConfigurationMutationACLPolicies { private void mockQueue(String queueName, MutableConfScheduler scheduler) throws IOException { QueueInfo queueInfo = QueueInfo.newInstance(queueName, 0, 0, 0, null, null, - null, null, null, null, false, null, false); + null, null, null, null, false); when(scheduler.getQueueInfo(eq(queueName), anyBoolean(), anyBoolean())) .thenReturn(queueInfo); Queue queue = mock(Queue.class); http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerApplicationAttempt.java ---------------------------------------------------------------------- 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/TestSchedulerApplicationAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerApplicationAttempt.java index 17f9d23..fa16eff 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerApplicationAttempt.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerApplicationAttempt.java @@ -165,7 +165,7 @@ public class TestSchedulerApplicationAttempt { private Queue createQueue(String name, Queue parent, float capacity) { QueueMetrics metrics = QueueMetrics.forQueue(name, parent, false, conf); QueueInfo queueInfo = QueueInfo.newInstance(name, capacity, 1.0f, 0, null, - null, QueueState.RUNNING, null, "", null, false, null, false); + null, QueueState.RUNNING, null, "", null, false); ActiveUsersManager activeUsersManager = new ActiveUsersManager(metrics); Queue queue = mock(Queue.class); when(queue.getMetrics()).thenReturn(metrics); http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java ---------------------------------------------------------------------- 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/TestLeafQueue.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/TestLeafQueue.java index 9f7919e..a32352b 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/TestLeafQueue.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/TestLeafQueue.java @@ -3972,7 +3972,7 @@ public class TestLeafQueue { float absCap) { CSQueueMetrics metrics = CSQueueMetrics.forQueue(name, parent, false, cs.getConf()); QueueInfo queueInfo = QueueInfo.newInstance(name, capacity, 1.0f, 0, null, - null, QueueState.RUNNING, null, "", null, false, null, false); + null, QueueState.RUNNING, null, "", null, false); ActiveUsersManager activeUsersManager = new ActiveUsersManager(metrics); AbstractCSQueue queue = mock(AbstractCSQueue.class); when(queue.getMetrics()).thenReturn(metrics); http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index 58c3923..1108f1a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -357,7 +357,7 @@ public class TestRMWebServicesCapacitySched extends JerseyTestBase { int numExpectedElements = 18; boolean isParentQueue = true; if (!info.has("queues")) { - numExpectedElements = 32; + numExpectedElements = 31; isParentQueue = false; } assertEquals("incorrect number of elements", numExpectedElements, info.length()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ded707/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md index 2cc6566..4754c94 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md @@ -228,7 +228,6 @@ The following configuration parameters can be configured in yarn-site.xml to con | Property | Description | |:---- |:---- | | `yarn.scheduler.capacity.<queue-path>.disable_preemption` | This configuration can be set to `true` to selectively disable preemption of application containers submitted to a given queue. This property applies only when system wide preemption is enabled by configuring `yarn.resourcemanager.scheduler.monitor.enable` to *true* and `yarn.resourcemanager.scheduler.monitor.policies` to *ProportionalCapacityPreemptionPolicy*. If this property is not set for a queue, then the property value is inherited from the queue's parent. Default value is false. -| `yarn.scheduler.capacity.<queue-path>.intra-queue-preemption.disable_preemption` | This configuration can be set to *true* to selectively disable intra-queue preemption of application containers submitted to a given queue. This property applies only when system wide preemption is enabled by configuring `yarn.resourcemanager.scheduler.monitor.enable` to *true*, `yarn.resourcemanager.scheduler.monitor.policies` to *ProportionalCapacityPreemptionPolicy*, and `yarn.resourcemanager.monitor.capacity.preemption.intra-queue-preemption.enabled` to *true*. If this property is not set for a queue, then the property value is inherited from the queue's parent. Default value is *false*. ###Reservation Properties @@ -374,4 +373,4 @@ Updating a Container (Experimental - API may change in the future) The **DECREASE_RESOURCE** and **DEMOTE_EXECUTION_TYPE** container updates are automatic - the AM does not explicitly have to ask the NM to decrease the resources of the container. The other update types require the AM to explicitly ask the NM to update the container. - If the **yarn.resourcemanager.auto-update.containers** configuration parameter is set to **true** (false by default), The RM will ensure that all container updates are automatic. + If the **yarn.resourcemanager.auto-update.containers** configuration parameter is set to **true** (false by default), The RM will ensure that all container updates are automatic. \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
