From 7ba5bb0c5baa935d0e657fcc1e41b1ed0e9f58f9 Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Wed, 19 Nov 2014 20:15:40 -0800 Subject: [PATCH] YARN-2315. FairScheduler: Set current capacity in addition to capacity. (Zhihai Xu via kasha) (cherry picked from commit a9a0cc3679432774154a07d3157ffa0a43e0bf01) --- hadoop-yarn-project/CHANGES.txt | 3 + .../scheduler/fair/FSQueue.java | 22 ++++--- .../scheduler/fair/TestFairScheduler.java | 61 +++++++++++++++++++ 3 files changed, 79 insertions(+), 7 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c246b8ee753..b6e69db96cd 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -94,6 +94,9 @@ Release 2.7.0 - UNRELEASED YARN-2865. Fixed RM to always create a new RMContext when transtions from StandBy to Active. (Rohith Sharmaks via jianhe) + YARN-2315. FairScheduler: Set current capacity in addition to capacity. + (Zhihai Xu via kasha) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java index e1050da7af9..349464e1ef2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java @@ -123,13 +123,21 @@ public abstract class FSQueue implements Queue, Schedulable { public QueueInfo getQueueInfo(boolean includeChildQueues, boolean recursive) { QueueInfo queueInfo = recordFactory.newRecordInstance(QueueInfo.class); queueInfo.setQueueName(getQueueName()); - // TODO: we might change these queue metrics around a little bit - // to match the semantics of the fair scheduler. - queueInfo.setCapacity((float) getFairShare().getMemory() / - scheduler.getClusterResource().getMemory()); - queueInfo.setCapacity((float) getResourceUsage().getMemory() / - scheduler.getClusterResource().getMemory()); - + + if (scheduler.getClusterResource().getMemory() == 0) { + queueInfo.setCapacity(0.0f); + } else { + queueInfo.setCapacity((float) getFairShare().getMemory() / + scheduler.getClusterResource().getMemory()); + } + + if (getFairShare().getMemory() == 0) { + queueInfo.setCurrentCapacity(0.0f); + } else { + queueInfo.setCurrentCapacity((float) getResourceUsage().getMemory() / + getFairShare().getMemory()); + } + ArrayList childQueueInfos = new ArrayList(); if (includeChildQueues) { Collection childQueues = getChildQueues(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java index 19963676a89..0b144990577 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java @@ -61,6 +61,7 @@ import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.api.records.QueueInfo; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.ResourceRequest; import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationSubmissionContextPBImpl; @@ -505,6 +506,66 @@ public class TestFairScheduler extends FairSchedulerTestBase { assertEquals(4096, queue.getFairShare().getMemory()); } + @Test + public void testQueueInfo() throws IOException { + conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE); + + PrintWriter out = new PrintWriter(new FileWriter(ALLOC_FILE)); + out.println(""); + out.println(""); + out.println(""); + out.println(".25"); + out.println(""); + out.println(""); + out.println(".75"); + out.println(""); + out.println(""); + out.close(); + + scheduler.init(conf); + scheduler.start(); + scheduler.reinitialize(conf, resourceManager.getRMContext()); + + // Add one big node (only care about aggregate capacity) + RMNode node1 = + MockNodes.newNodeInfo(1, Resources.createResource(8 * 1024, 8), 1, + "127.0.0.1"); + NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1); + scheduler.handle(nodeEvent1); + + // Queue A wants 1 * 1024. + createSchedulingRequest(1 * 1024, "queueA", "user1"); + // Queue B wants 6 * 1024 + createSchedulingRequest(6 * 1024, "queueB", "user1"); + + scheduler.update(); + + // Capacity should be the same as weight of Queue, + // because the sum of all active Queues' weight are 1. + // Before NodeUpdate Event, CurrentCapacity should be 0 + QueueInfo queueInfo = scheduler.getQueueInfo("queueA", false, false); + Assert.assertEquals(0.25f, queueInfo.getCapacity(), 0.0f); + Assert.assertEquals(0.0f, queueInfo.getCurrentCapacity(), 0.0f); + queueInfo = scheduler.getQueueInfo("queueB", false, false); + Assert.assertEquals(0.75f, queueInfo.getCapacity(), 0.0f); + Assert.assertEquals(0.0f, queueInfo.getCurrentCapacity(), 0.0f); + + // Each NodeUpdate Event will only assign one container. + // To assign two containers, call handle NodeUpdate Event twice. + NodeUpdateSchedulerEvent nodeEvent2 = new NodeUpdateSchedulerEvent(node1); + scheduler.handle(nodeEvent2); + scheduler.handle(nodeEvent2); + + // After NodeUpdate Event, CurrentCapacity for queueA should be 1/2=0.5 + // and CurrentCapacity for queueB should be 6/6=1. + queueInfo = scheduler.getQueueInfo("queueA", false, false); + Assert.assertEquals(0.25f, queueInfo.getCapacity(), 0.0f); + Assert.assertEquals(0.5f, queueInfo.getCurrentCapacity(), 0.0f); + queueInfo = scheduler.getQueueInfo("queueB", false, false); + Assert.assertEquals(0.75f, queueInfo.getCapacity(), 0.0f); + Assert.assertEquals(1.0f, queueInfo.getCurrentCapacity(), 0.0f); + } + @Test public void testSimpleHierarchicalFairShareCalculation() throws IOException { scheduler.init(conf);