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 897b442..f187942 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,6 +94,29 @@ public static QueueInfo newInstance(String queueName, float capacity, return queueInfo; } + @Private + @Unstable + public static QueueInfo newInstance(String queueName, float capacity, + float maximumCapacity, float currentCapacity, + List childQueues, List applications, + QueueState queueState, Set accessibleNodeLabels, + String defaultNodeLabelExpression, QueueStatistics queueStatistics, + boolean preemptionDisabled, + Map queueConfigurations, + boolean intreQueuePreemptionDisabled) { + QueueInfo queueInfo = QueueInfo.newInstance(queueName, capacity, + maximumCapacity, currentCapacity, + childQueues, applications, + queueState, accessibleNodeLabels, + defaultNodeLabelExpression, queueStatistics, + preemptionDisabled, queueConfigurations); + // Preemption is only enabled when both cross-queue and in-queue preemption + // are enabled + queueInfo.setIntraQueuePreemptionDisabled( + preemptionDisabled || intreQueuePreemptionDisabled); + return queueInfo; + } + /** * Get the name of the queue. * @return name of the queue @@ -261,4 +284,19 @@ public abstract void setDefaultNodeLabelExpression( @Unstable public abstract void setQueueConfigurations( Map 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); } 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 25c8569..b978761 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 @@ -569,6 +569,7 @@ message QueueInfoProto { optional QueueStatisticsProto queueStatistics = 10; optional bool preemptionDisabled = 11; repeated QueueConfigurationsMapProto queueConfigurationsMap = 12; + optional bool intraQueuePreemptionDisabled = 13; } message QueueConfigurationsProto { 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 330b081..6c7eaeb 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 @@ -155,8 +155,14 @@ private void printQueueInfo(PrintWriter writer, QueueInfo queueInfo) { Boolean preemptStatus = queueInfo.getPreemptionDisabled(); if (preemptStatus != null) { - writer.print("\tPreemption : "); + writer.print("\tCross-queue Preemption : "); writer.println(preemptStatus ? "disabled" : "enabled"); } + + Boolean intraQueuePreemption = queueInfo.getIntraQueuePreemptionDisabled(); + if (intraQueuePreemption != null) { + writer.print("\tIn-queue Preemption : "); + writer.println(intraQueuePreemption ? "disabled" : "enabled"); + } } } 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 54537ce..7937b15 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,7 +665,8 @@ public YarnClusterMetrics createFakeYarnClusterMetrics() { public QueueInfo createFakeQueueInfo() { return QueueInfo.newInstance("root", 100f, 100f, 50f, null, - createFakeAppReports(), QueueState.RUNNING, null, null, null, false); + createFakeAppReports(), QueueState.RUNNING, null, null, null, false, + null, false); } public List createFakeQueueUserACLInfoList() { 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 fdd3fc8..e78c111 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,7 +1712,8 @@ public void testGetQueueInfo() throws Exception { 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); + null, null, QueueState.RUNNING, nodeLabels, "GPU", null, false, null, + false); when(client.getQueueInfo(any(String.class))).thenReturn(queueInfo); int result = cli.run(new String[] { "-status", "queueA" }); assertEquals(0, result); @@ -1727,14 +1728,15 @@ public void testGetQueueInfo() throws Exception { pw.println("\tMaximum Capacity : " + "80.0%"); pw.println("\tDefault Node Label expression : " + "GPU"); pw.println("\tAccessible Node Labels : " + "JDK_7,GPU"); - pw.println("\tPreemption : " + "enabled"); + pw.println("\tCross-queue Preemption : " + "enabled"); + pw.println("\tIn-queue Preemption : " + "enabled"); pw.close(); String queueInfoStr = baos.toString("UTF-8"); Assert.assertEquals(queueInfoStr, sysOutStream.toString()); } @Test - public void testGetQueueInfoPreemptionEnabled() throws Exception { + public void testGetQueueInfoOverrideIntraQueuePreemption() throws Exception { CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration(); ReservationSystemTestUtil.setupQueueConfiguration(conf); conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class, @@ -1743,9 +1745,80 @@ public void testGetQueueInfoPreemptionEnabled() throws Exception { 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("Cross-queue Preemption : enabled")); + // In-queue preemption is disabled at the "root.a" queue level + Assert.assertTrue(queueStatusOut + .contains("In-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("Cross-queue Preemption : enabled")); + // In-queue preemption is enabled at the "root.a.a1" queue level + Assert.assertTrue(queueStatusOut + .contains("In-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); + 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"); + conf.setBoolean( + CapacitySchedulerConfiguration.INTRAQUEUE_PREEMPTION_ENABLED, true); MiniYARNCluster cluster = - new MiniYARNCluster("testReservationAPIs", 2, 1, 1); + new MiniYARNCluster("testGetQueueInfoPreemptionEnabled", 2, 1, 1); YarnClient yarnClient = null; try { @@ -1763,8 +1836,11 @@ public void testGetQueueInfoPreemptionEnabled() throws Exception { sysOutStream.reset(); int result = cli.run(new String[] { "-status", "a1" }); assertEquals(0, result); - Assert.assertTrue(sysOutStream.toString() - .contains("Preemption : enabled")); + String queueStatusOut = sysOutStream.toString(); + Assert.assertTrue(queueStatusOut + .contains("Cross-queue Preemption : enabled")); + Assert.assertTrue(queueStatusOut + .contains("In-queue Preemption : enabled")); } finally { // clean-up if (yarnClient != null) { @@ -1804,8 +1880,11 @@ public void testGetQueueInfoPreemptionDisabled() throws Exception { sysOutStream.reset(); int result = cli.run(new String[] { "-status", "a1" }); assertEquals(0, result); - Assert.assertTrue(sysOutStream.toString() - .contains("Preemption : disabled")); + String queueStatusOut = sysOutStream.toString(); + Assert.assertTrue(queueStatusOut + .contains("Cross-queue Preemption : disabled")); + Assert.assertTrue(queueStatusOut + .contains("In-queue Preemption : disabled")); } } @@ -1813,7 +1892,7 @@ public void testGetQueueInfoPreemptionDisabled() throws Exception { 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); + null, null, QueueState.RUNNING, null, null, null, true, null, false); when(client.getQueueInfo(any(String.class))).thenReturn(queueInfo); int result = cli.run(new String[] { "-status", "queueA" }); assertEquals(0, result); @@ -1829,7 +1908,8 @@ public void testGetQueueInfoWithEmptyNodeLabel() throws Exception { pw.println("\tDefault Node Label expression : " + NodeLabel.DEFAULT_NODE_LABEL_PARTITION); pw.println("\tAccessible Node Labels : "); - pw.println("\tPreemption : " + "disabled"); + pw.println("\tCross-queue Preemption : " + "disabled"); + pw.println("\tIn-queue Preemption : " + "disabled"); pw.close(); String queueInfoStr = baos.toString("UTF-8"); Assert.assertEquals(queueInfoStr, sysOutStream.toString()); 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 1d2a6dd..f735139 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,4 +500,17 @@ public void setQueueConfigurations( 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); + } } 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 ae80910..8c41906 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 @@ -414,7 +414,7 @@ public static void setup() throws Exception { // 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)); + "x && y", null, false, null, false)); generateByNewInstance(QueueStatistics.class); generateByNewInstance(QueueUserACLInfo.class); generateByNewInstance(YarnClusterMetrics.class); 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 44fa736..5b6932e 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 int compare(TempAppPerPartition ta1, TempAppPerPartition ta2) { continue; } - // Don't preempt if disabled for this queue. - if (leafQueue.getPreemptionDisabled()) { + // Don't preempt if intra-queue preemption is disabled for this queue. + if (leafQueue.getIntraQueuePreemptionDisabled()) { continue; } 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 9afbdd5..3efa8fc 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 @@ -97,6 +97,7 @@ new HashMap(); volatile boolean reservationsContinueLooking; private volatile boolean preemptionDisabled; + private boolean intraQueuePreemptionDisabled; // Track resource usage-by-label like used-resource/pending-resource, etc. volatile ResourceUsage queueUsage; @@ -405,6 +406,8 @@ protected void setupQueueConfigs(Resource clusterResource, this.preemptionDisabled = isQueueHierarchyPreemptionDisabled(this, configuration); + this.intraQueuePreemptionDisabled = + isIntraQueueHierarchyPreemptionDisabled(this); this.priority = configuration.getQueuePriority( getQueuePath()); @@ -613,6 +616,7 @@ protected QueueInfo getQueueInfo() { queueInfo.setCurrentCapacity(getUsedCapacity()); queueInfo.setQueueStatistics(getQueueStatistics()); queueInfo.setPreemptionDisabled(preemptionDisabled); + queueInfo.setIntraQueuePreemptionDisabled(intraQueuePreemptionDisabled); queueInfo.setQueueConfigurations(getQueueConfigurations()); return queueInfo; } @@ -735,6 +739,11 @@ public boolean getReservationContinueLooking() { public boolean getPreemptionDisabled() { return preemptionDisabled; } + + @Private + public boolean getIntraQueuePreemptionDisabled() { + return intraQueuePreemptionDisabled; + } @Private public QueueCapacities getQueueCapacities() { @@ -757,12 +766,12 @@ public QueueResourceQuotas getQueueResourceQuotas() { } /** - * The specified queue is preemptable if system-wide preemption is turned on - * unless any queue in the qPath hierarchy has explicitly turned - * preemption off. - * NOTE: Preemptability is inherited from a queue's parent. + * The specified queue is cross-queue preemptable if system-wide cross-queue + * preemption is turned on unless any queue in the qPath hierarchy + * has explicitly turned cross-queue preemption off. + * NOTE: Cross-queue preemptability is inherited from a queue's parent. * - * @return true if queue has preemption disabled, false otherwise + * @return true if queue has cross-queue preemption disabled, false otherwise */ private boolean isQueueHierarchyPreemptionDisabled(CSQueue q, CapacitySchedulerConfiguration configuration) { @@ -790,7 +799,41 @@ private boolean isQueueHierarchyPreemptionDisabled(CSQueue q, return configuration.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 qPath hierarchy has explicitly turned off intra + * queue preemption. + * NOTE: Intra-queue preemptability is inherited from a queue's parent. + * + * @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.getIntraQueuePreemptionDisabled()); + } + private Resource getCurrentLimitResource(String nodePartition, Resource clusterResource, ResourceLimits currentResourceLimits, SchedulingMode schedulingMode) { 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 5dd307c..f2a2890 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 @@ -276,6 +276,13 @@ public void attachContainer(Resource clusterResource, * @return true if disable_preemption is set, false if not */ public boolean getPreemptionDisabled(); + + /** + * Check whether intra-queue preemption disable is set for this queue + * @return true if intra-queue preemption is disabled for this queue, + * false if not + */ + public boolean getIntraQueuePreemptionDisabled(); /** * Get QueueCapacities of this queue 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 00733a1..a9cf714 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 @@ -1216,6 +1216,21 @@ public boolean getPreemptionDisabled(String queue, boolean defaultVal) { } /** + * 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 getConfiguredNodeLabels(String queuePath) { 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 7f025a7..6e09a55 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 @@ -200,7 +200,10 @@ private void renderCommonLeafQueueInfo(ResponseInfo ri) { __("Configured User Limit Factor:", lqinfo.getUserLimitFactor()). __("Accessible Node Labels:", StringUtils.join(",", lqinfo.getNodeLabels())). __("Ordering Policy: ", lqinfo.getOrderingPolicyInfo()). - __("Preemption:", lqinfo.getPreemptionDisabled() ? "disabled" : "enabled"). + __("Cross-queue Preemption:", + lqinfo.getPreemptionDisabled() ? "disabled" : "enabled"). + __("In-queue Preemption:", lqinfo.getIntraQueuePreemptionDisabled() + ? "disabled" : "enabled"). __("Default Node Label Expression:", lqinfo.getDefaultNodeLabelExpression() == null ? NodeLabel.DEFAULT_NODE_LABEL_PARTITION 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 b5f4e79..5cd49cc 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 @@ -49,6 +49,7 @@ protected ResourceInfo usedAMResource; protected ResourceInfo userAMResourceLimit; protected boolean preemptionDisabled; + protected boolean intraQueuePreemptionDisabled; protected String defaultNodeLabelExpression; protected int defaultPriority; protected boolean isAutoCreatedLeafQueue; @@ -72,6 +73,7 @@ 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(); @@ -150,6 +152,12 @@ public ResourceInfo getUserAMResourceLimit() { public boolean getPreemptionDisabled() { return preemptionDisabled; } + + public boolean getIntraQueuePreemptionDisabled() { + // Preemption is only enabled when both cross-queue and in-queue preemption + // are enabled + return preemptionDisabled || intraQueuePreemptionDisabled; + } public String getOrderingPolicyInfo() { return orderingPolicyInfo; 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 398e909..9a23c1d 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 void setUp() throws IOException { 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, null, null, null, false, null, false); when(scheduler.getQueueInfo(eq(queueName), anyBoolean(), anyBoolean())) .thenReturn(queueInfo); Queue queue = mock(Queue.class); 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 fa16eff..17f9d23 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 @@ private Queue createQueue(String name, Queue parent) { 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, QueueState.RUNNING, null, "", null, false, null, false); ActiveUsersManager activeUsersManager = new ActiveUsersManager(metrics); Queue queue = mock(Queue.class); when(queue.getMetrics()).thenReturn(metrics); 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 c45bdb4..04bb791 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 @@ -4103,7 +4103,7 @@ private AbstractCSQueue createQueue(String name, Queue parent, float capacity, float absCap, Resource res) { 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, QueueState.RUNNING, null, "", null, false, null, false); ActiveUsersManager activeUsersManager = new ActiveUsersManager(metrics); AbstractCSQueue queue = mock(AbstractCSQueue.class); when(queue.getMetrics()).thenReturn(metrics);