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 ka...@apache.org on 2015/05/09 01:40:07 UTC
hadoop git commit: YARN-3271. FairScheduler: Move tests related to
max-runnable-apps from TestFairScheduler to TestAppRunnability. (nijel via
kasha)
Repository: hadoop
Updated Branches:
refs/heads/trunk 96473bdc2 -> 2fb44c8aa
YARN-3271. FairScheduler: Move tests related to max-runnable-apps from TestFairScheduler to TestAppRunnability. (nijel via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2fb44c8a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2fb44c8a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2fb44c8a
Branch: refs/heads/trunk
Commit: 2fb44c8aaf7f35f425d80b133a28b1c1f305c3e6
Parents: 96473bd
Author: Karthik Kambatla <ka...@apache.org>
Authored: Fri May 8 16:39:10 2015 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Fri May 8 16:39:10 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 6 +-
.../scheduler/fair/TestAppRunnability.java | 283 +++++++++++++++++++
.../scheduler/fair/TestFairScheduler.java | 224 +--------------
3 files changed, 293 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2fb44c8a/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 9b75474..5f00890 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -209,7 +209,11 @@ Release 2.8.0 - UNRELEASED
YARN-2331. Distinguish shutdown during supervision vs. shutdown for
rolling upgrade. (Jason Lowe via xgong)
- YARN-1050. Document the Fair Scheduler REST API. (Kenji Kikushima and Roman Shaposhnik via kasha)
+ YARN-1050. Document the Fair Scheduler REST API.
+ (Kenji Kikushima and Roman Shaposhnik via kasha)
+
+ YARN-3271. FairScheduler: Move tests related to max-runnable-apps from
+ TestFairScheduler to TestAppRunnability. (nijel via kasha)
OPTIMIZATIONS
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2fb44c8a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestAppRunnability.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/fair/TestAppRunnability.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/TestAppRunnability.java
new file mode 100644
index 0000000..7ca9606
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestAppRunnability.java
@@ -0,0 +1,283 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+import org.apache.hadoop.yarn.api.records.ApplicationId;
+import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.server.resourcemanager.MockNodes;
+import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
+import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAddedSchedulerEvent;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptAddedSchedulerEvent;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptRemovedSchedulerEvent;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
+import org.apache.hadoop.yarn.util.resource.Resources;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/*
+ * This class is to test the fair scheduler functionality of
+ * deciding the number of runnable application under various conditions.
+ */
+public class TestAppRunnability extends FairSchedulerTestBase {
+ private final static String ALLOC_FILE =
+ new File(TEST_DIR, "test-queues").getAbsolutePath();
+
+ @Before
+ public void setUp() throws IOException {
+ conf = createConfiguration();
+ resourceManager = new MockRM(conf);
+ resourceManager.start();
+ scheduler = (FairScheduler) resourceManager.getResourceScheduler();
+ }
+
+ @After
+ public void tearDown() {
+ if (resourceManager != null) {
+ resourceManager.stop();
+ resourceManager = null;
+ }
+ QueueMetrics.clearQueueMetrics();
+ DefaultMetricsSystem.shutdown();
+ }
+
+ @Test
+ public void testUserAsDefaultQueue() throws Exception {
+ conf.set(FairSchedulerConfiguration.USER_AS_DEFAULT_QUEUE, "true");
+ scheduler.reinitialize(conf, resourceManager.getRMContext());
+ ApplicationAttemptId appAttemptId = createAppAttemptId(1, 1);
+ createApplicationWithAMResource(appAttemptId, "default", "user1", null);
+ assertEquals(1, scheduler.getQueueManager().getLeafQueue("user1", true)
+ .getNumRunnableApps());
+ assertEquals(0, scheduler.getQueueManager().getLeafQueue("default", true)
+ .getNumRunnableApps());
+ assertEquals("root.user1", resourceManager.getRMContext().getRMApps()
+ .get(appAttemptId.getApplicationId()).getQueue());
+ }
+
+ @Test
+ public void testNotUserAsDefaultQueue() throws Exception {
+
+ // Restarting resource manager since the Conf object is changed changed.
+ resourceManager.stop();
+ conf.set(FairSchedulerConfiguration.USER_AS_DEFAULT_QUEUE, "false");
+ resourceManager = new MockRM(conf);
+ resourceManager.start();
+ scheduler = (FairScheduler) resourceManager.getResourceScheduler();
+
+ ApplicationAttemptId appAttemptId = createAppAttemptId(1, 1);
+ createApplicationWithAMResource(appAttemptId, "default", "user2", null);
+ assertEquals(0, scheduler.getQueueManager().getLeafQueue("user1", true)
+ .getNumRunnableApps());
+ assertEquals(1, scheduler.getQueueManager().getLeafQueue("default", true)
+ .getNumRunnableApps());
+ assertEquals(0, scheduler.getQueueManager().getLeafQueue("user2", true)
+ .getNumRunnableApps());
+ }
+
+ @Test
+ public void testAppAdditionAndRemoval() throws Exception {
+ ApplicationAttemptId attemptId = createAppAttemptId(1, 1);
+ AppAddedSchedulerEvent appAddedEvent =
+ new AppAddedSchedulerEvent(attemptId.getApplicationId(), "default",
+ "user1");
+ scheduler.handle(appAddedEvent);
+ AppAttemptAddedSchedulerEvent attemptAddedEvent =
+ new AppAttemptAddedSchedulerEvent(createAppAttemptId(1, 1), false);
+ scheduler.handle(attemptAddedEvent);
+
+ // Scheduler should have two queues (the default and the one created for
+ // user1)
+ assertEquals(2, scheduler.getQueueManager().getLeafQueues().size());
+
+ // That queue should have one app
+ assertEquals(1, scheduler.getQueueManager().getLeafQueue("user1", true)
+ .getNumRunnableApps());
+
+ AppAttemptRemovedSchedulerEvent appRemovedEvent1 =
+ new AppAttemptRemovedSchedulerEvent(createAppAttemptId(1, 1),
+ RMAppAttemptState.FINISHED, false);
+
+ // Now remove app
+ scheduler.handle(appRemovedEvent1);
+
+ // Queue should have no apps
+ assertEquals(0, scheduler.getQueueManager().getLeafQueue("user1", true)
+ .getNumRunnableApps());
+ }
+
+ @Test
+ public void testPreemptionVariablesForQueueCreatedRuntime() throws Exception {
+
+ // Set preemption variables for the root queue
+ FSParentQueue root = scheduler.getQueueManager().getRootQueue();
+ root.setMinSharePreemptionTimeout(10000);
+ root.setFairSharePreemptionTimeout(15000);
+ root.setFairSharePreemptionThreshold(.6f);
+
+ // User1 submits one application
+ ApplicationAttemptId appAttemptId = createAppAttemptId(1, 1);
+ createApplicationWithAMResource(appAttemptId, "default", "user1", null);
+
+ // The user1 queue should inherit the configurations from the root queue
+ FSLeafQueue userQueue =
+ scheduler.getQueueManager().getLeafQueue("user1", true);
+ assertEquals(1, userQueue.getNumRunnableApps());
+ assertEquals(10000, userQueue.getMinSharePreemptionTimeout());
+ assertEquals(15000, userQueue.getFairSharePreemptionTimeout());
+ assertEquals(.6f, userQueue.getFairSharePreemptionThreshold(), 0.001);
+ }
+
+ @Test
+ public void testDontAllowUndeclaredPools() throws Exception {
+ conf.setBoolean(FairSchedulerConfiguration.ALLOW_UNDECLARED_POOLS, false);
+ conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE);
+
+ PrintWriter out = new PrintWriter(new FileWriter(ALLOC_FILE));
+ out.println("<?xml version=\"1.0\"?>");
+ out.println("<allocations>");
+ out.println("<queue name=\"jerry\">");
+ out.println("</queue>");
+ out.println("</allocations>");
+ out.close();
+ // Restarting resource manager since the file location and content is
+ // changed.
+ resourceManager.stop();
+ resourceManager = new MockRM(conf);
+ resourceManager.start();
+ scheduler = (FairScheduler) resourceManager.getResourceScheduler();
+
+ QueueManager queueManager = scheduler.getQueueManager();
+
+ FSLeafQueue jerryQueue = queueManager.getLeafQueue("jerry", false);
+ FSLeafQueue defaultQueue = queueManager.getLeafQueue("default", false);
+
+ // Should get put into jerry
+ createSchedulingRequest(1024, "jerry", "someuser");
+ assertEquals(1, jerryQueue.getNumRunnableApps());
+
+ // Should get forced into default
+ createSchedulingRequest(1024, "newqueue", "someuser");
+ assertEquals(1, jerryQueue.getNumRunnableApps());
+ assertEquals(1, defaultQueue.getNumRunnableApps());
+
+ // Would get put into someuser because of user-as-default-queue, but should
+ // be forced into default
+ createSchedulingRequest(1024, "default", "someuser");
+ assertEquals(1, jerryQueue.getNumRunnableApps());
+ assertEquals(2, defaultQueue.getNumRunnableApps());
+
+ // Should get put into jerry because of user-as-default-queue
+ createSchedulingRequest(1024, "default", "jerry");
+ assertEquals(2, jerryQueue.getNumRunnableApps());
+ assertEquals(2, defaultQueue.getNumRunnableApps());
+ }
+
+ @Test
+ public void testMoveRunnableApp() throws Exception {
+ scheduler.reinitialize(conf, resourceManager.getRMContext());
+
+ QueueManager queueMgr = scheduler.getQueueManager();
+ FSLeafQueue oldQueue = queueMgr.getLeafQueue("queue1", true);
+ FSLeafQueue targetQueue = queueMgr.getLeafQueue("queue2", true);
+
+ ApplicationAttemptId appAttId =
+ createSchedulingRequest(1024, 1, "queue1", "user1", 3);
+ ApplicationId appId = appAttId.getApplicationId();
+ RMNode node = MockNodes.newNodeInfo(1, Resources.createResource(1024));
+ NodeAddedSchedulerEvent nodeEvent = new NodeAddedSchedulerEvent(node);
+ NodeUpdateSchedulerEvent updateEvent = new NodeUpdateSchedulerEvent(node);
+ scheduler.handle(nodeEvent);
+ scheduler.handle(updateEvent);
+
+ assertEquals(Resource.newInstance(1024, 1), oldQueue.getResourceUsage());
+ scheduler.update();
+ assertEquals(Resource.newInstance(3072, 3), oldQueue.getDemand());
+
+ scheduler.moveApplication(appId, "queue2");
+ FSAppAttempt app = scheduler.getSchedulerApp(appAttId);
+ assertSame(targetQueue, app.getQueue());
+ assertFalse(oldQueue.isRunnableApp(app));
+ assertTrue(targetQueue.isRunnableApp(app));
+ assertEquals(Resource.newInstance(0, 0), oldQueue.getResourceUsage());
+ assertEquals(Resource.newInstance(1024, 1), targetQueue.getResourceUsage());
+ assertEquals(0, oldQueue.getNumRunnableApps());
+ assertEquals(1, targetQueue.getNumRunnableApps());
+ assertEquals(1, queueMgr.getRootQueue().getNumRunnableApps());
+
+ scheduler.update();
+ assertEquals(Resource.newInstance(0, 0), oldQueue.getDemand());
+ assertEquals(Resource.newInstance(3072, 3), targetQueue.getDemand());
+ }
+
+ @Test
+ public void testMoveNonRunnableApp() throws Exception {
+ QueueManager queueMgr = scheduler.getQueueManager();
+ FSLeafQueue oldQueue = queueMgr.getLeafQueue("queue1", true);
+ FSLeafQueue targetQueue = queueMgr.getLeafQueue("queue2", true);
+ scheduler.getAllocationConfiguration().queueMaxApps.put("root.queue1", 0);
+ scheduler.getAllocationConfiguration().queueMaxApps.put("root.queue2", 0);
+
+ ApplicationAttemptId appAttId =
+ createSchedulingRequest(1024, 1, "queue1", "user1", 3);
+
+ assertEquals(0, oldQueue.getNumRunnableApps());
+ scheduler.moveApplication(appAttId.getApplicationId(), "queue2");
+ assertEquals(0, oldQueue.getNumRunnableApps());
+ assertEquals(0, targetQueue.getNumRunnableApps());
+ assertEquals(0, queueMgr.getRootQueue().getNumRunnableApps());
+ }
+
+ @Test
+ public void testMoveMakesAppRunnable() throws Exception {
+ QueueManager queueMgr = scheduler.getQueueManager();
+ FSLeafQueue oldQueue = queueMgr.getLeafQueue("queue1", true);
+ FSLeafQueue targetQueue = queueMgr.getLeafQueue("queue2", true);
+ scheduler.getAllocationConfiguration().queueMaxApps.put("root.queue1", 0);
+
+ ApplicationAttemptId appAttId =
+ createSchedulingRequest(1024, 1, "queue1", "user1", 3);
+
+ FSAppAttempt app = scheduler.getSchedulerApp(appAttId);
+ assertTrue(oldQueue.isNonRunnableApp(app));
+
+ scheduler.moveApplication(appAttId.getApplicationId(), "queue2");
+ assertFalse(oldQueue.isNonRunnableApp(app));
+ assertFalse(targetQueue.isNonRunnableApp(app));
+ assertTrue(targetQueue.isRunnableApp(app));
+ assertEquals(1, targetQueue.getNumRunnableApps());
+ assertEquals(1, queueMgr.getRootQueue().getNumRunnableApps());
+ }
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2fb44c8a/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
----------------------------------------------------------------------
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 98877e7..fc69de7 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
@@ -935,37 +935,8 @@ public class TestFairScheduler extends FairSchedulerTestBase {
getResourceUsage().getMemory());
}
- @Test
- public void testUserAsDefaultQueue() throws Exception {
- conf.set(FairSchedulerConfiguration.USER_AS_DEFAULT_QUEUE, "true");
- scheduler.init(conf);
- scheduler.start();
- scheduler.reinitialize(conf, resourceManager.getRMContext());
- ApplicationAttemptId appAttemptId = createAppAttemptId(1, 1);
- createApplicationWithAMResource(appAttemptId, "default", "user1", null);
- assertEquals(1, scheduler.getQueueManager().getLeafQueue("user1", true)
- .getNumRunnableApps());
- assertEquals(0, scheduler.getQueueManager().getLeafQueue("default", true)
- .getNumRunnableApps());
- assertEquals("root.user1", resourceManager.getRMContext().getRMApps()
- .get(appAttemptId.getApplicationId()).getQueue());
- }
- @Test
- public void testNotUserAsDefaultQueue() throws Exception {
- conf.set(FairSchedulerConfiguration.USER_AS_DEFAULT_QUEUE, "false");
- scheduler.init(conf);
- scheduler.start();
- scheduler.reinitialize(conf, resourceManager.getRMContext());
- ApplicationAttemptId appAttemptId = createAppAttemptId(1, 1);
- createApplicationWithAMResource(appAttemptId, "default", "user2", null);
- assertEquals(0, scheduler.getQueueManager().getLeafQueue("user1", true)
- .getNumRunnableApps());
- assertEquals(1, scheduler.getQueueManager().getLeafQueue("default", true)
- .getNumRunnableApps());
- assertEquals(0, scheduler.getQueueManager().getLeafQueue("user2", true)
- .getNumRunnableApps());
- }
+
@Test
public void testEmptyQueueName() throws Exception {
@@ -1429,37 +1400,6 @@ public class TestFairScheduler extends FairSchedulerTestBase {
}
@Test
- public void testAppAdditionAndRemoval() throws Exception {
- scheduler.init(conf);
- scheduler.start();
- scheduler.reinitialize(conf, resourceManager.getRMContext());
- ApplicationAttemptId attemptId =createAppAttemptId(1, 1);
- AppAddedSchedulerEvent appAddedEvent = new AppAddedSchedulerEvent(attemptId.getApplicationId(), "default",
- "user1");
- scheduler.handle(appAddedEvent);
- AppAttemptAddedSchedulerEvent attemptAddedEvent =
- new AppAttemptAddedSchedulerEvent(createAppAttemptId(1, 1), false);
- scheduler.handle(attemptAddedEvent);
-
- // Scheduler should have two queues (the default and the one created for user1)
- assertEquals(2, scheduler.getQueueManager().getLeafQueues().size());
-
- // That queue should have one app
- assertEquals(1, scheduler.getQueueManager().getLeafQueue("user1", true)
- .getNumRunnableApps());
-
- AppAttemptRemovedSchedulerEvent appRemovedEvent1 = new AppAttemptRemovedSchedulerEvent(
- createAppAttemptId(1, 1), RMAppAttemptState.FINISHED, false);
-
- // Now remove app
- scheduler.handle(appRemovedEvent1);
-
- // Queue should have no apps
- assertEquals(0, scheduler.getQueueManager().getLeafQueue("user1", true)
- .getNumRunnableApps());
- }
-
- @Test
public void testHierarchicalQueueAllocationFileParsing() throws IOException, SAXException,
AllocationConfigurationException, ParserConfigurationException {
conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE);
@@ -2180,33 +2120,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
.getFairSharePreemptionTimeout());
}
- @Test
- public void testPreemptionVariablesForQueueCreatedRuntime() throws Exception {
- conf.set(FairSchedulerConfiguration.USER_AS_DEFAULT_QUEUE, "true");
- scheduler.init(conf);
- scheduler.start();
- scheduler.reinitialize(conf, resourceManager.getRMContext());
-
- // Set preemption variables for the root queue
- FSParentQueue root = scheduler.getQueueManager().getRootQueue();
- root.setMinSharePreemptionTimeout(10000);
- root.setFairSharePreemptionTimeout(15000);
- root.setFairSharePreemptionThreshold(.6f);
-
- // User1 submits one application
- ApplicationAttemptId appAttemptId = createAppAttemptId(1, 1);
- createApplicationWithAMResource(appAttemptId, "default", "user1", null);
-
- // The user1 queue should inherit the configurations from the root queue
- FSLeafQueue userQueue =
- scheduler.getQueueManager().getLeafQueue("user1", true);
- assertEquals(1, userQueue.getNumRunnableApps());
- assertEquals(10000, userQueue.getMinSharePreemptionTimeout());
- assertEquals(15000, userQueue.getFairSharePreemptionTimeout());
- assertEquals(.6f, userQueue.getFairSharePreemptionThreshold(), 0.001);
- }
-
- @Test (timeout = 5000)
+ @Test(timeout = 5000)
public void testMultipleContainersWaitingForReservation() throws IOException {
scheduler.init(conf);
scheduler.start();
@@ -3975,48 +3889,6 @@ public class TestFairScheduler extends FairSchedulerTestBase {
}
@Test
- public void testDontAllowUndeclaredPools() throws Exception{
- conf.setBoolean(FairSchedulerConfiguration.ALLOW_UNDECLARED_POOLS, false);
- conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE);
-
- PrintWriter out = new PrintWriter(new FileWriter(ALLOC_FILE));
- out.println("<?xml version=\"1.0\"?>");
- out.println("<allocations>");
- out.println("<queue name=\"jerry\">");
- out.println("</queue>");
- out.println("</allocations>");
- out.close();
-
- scheduler.init(conf);
- scheduler.start();
- scheduler.reinitialize(conf, resourceManager.getRMContext());
- QueueManager queueManager = scheduler.getQueueManager();
-
- FSLeafQueue jerryQueue = queueManager.getLeafQueue("jerry", false);
- FSLeafQueue defaultQueue = queueManager.getLeafQueue("default", false);
-
- // Should get put into jerry
- createSchedulingRequest(1024, "jerry", "someuser");
- assertEquals(1, jerryQueue.getNumRunnableApps());
-
- // Should get forced into default
- createSchedulingRequest(1024, "newqueue", "someuser");
- assertEquals(1, jerryQueue.getNumRunnableApps());
- assertEquals(1, defaultQueue.getNumRunnableApps());
-
- // Would get put into someuser because of user-as-default-queue, but should
- // be forced into default
- createSchedulingRequest(1024, "default", "someuser");
- assertEquals(1, jerryQueue.getNumRunnableApps());
- assertEquals(2, defaultQueue.getNumRunnableApps());
-
- // Should get put into jerry because of user-as-default-queue
- createSchedulingRequest(1024, "default", "jerry");
- assertEquals(2, jerryQueue.getNumRunnableApps());
- assertEquals(2, defaultQueue.getNumRunnableApps());
- }
-
- @Test
public void testDefaultRuleInitializesProperlyWhenPolicyNotConfigured()
throws IOException {
// This test verifies if default rule in queue placement policy
@@ -4036,8 +3908,8 @@ public class TestFairScheduler extends FairSchedulerTestBase {
scheduler.start();
scheduler.reinitialize(conf, resourceManager.getRMContext());
- List<QueuePlacementRule> rules = scheduler.allocConf.placementPolicy
- .getRules();
+ List<QueuePlacementRule> rules =
+ scheduler.allocConf.placementPolicy.getRules();
for (QueuePlacementRule rule : rules) {
if (rule instanceof Default) {
@@ -4047,7 +3919,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
}
}
- @Test(timeout=5000)
+ @Test(timeout = 5000)
public void testRecoverRequestAfterPreemption() throws Exception {
conf.setLong(FairSchedulerConfiguration.WAIT_TIME_BEFORE_KILL, 10);
@@ -4229,92 +4101,6 @@ public class TestFairScheduler extends FairSchedulerTestBase {
TestSchedulerUtils.verifyAppAddedAndRemovedFromScheduler(
scheduler.getSchedulerApplications(), scheduler, "default");
}
-
- @Test
- public void testMoveRunnableApp() throws Exception {
- scheduler.init(conf);
- scheduler.start();
- scheduler.reinitialize(conf, resourceManager.getRMContext());
-
- QueueManager queueMgr = scheduler.getQueueManager();
- FSLeafQueue oldQueue = queueMgr.getLeafQueue("queue1", true);
- FSLeafQueue targetQueue = queueMgr.getLeafQueue("queue2", true);
-
- ApplicationAttemptId appAttId =
- createSchedulingRequest(1024, 1, "queue1", "user1", 3);
- ApplicationId appId = appAttId.getApplicationId();
- RMNode node = MockNodes.newNodeInfo(1, Resources.createResource(1024));
- NodeAddedSchedulerEvent nodeEvent = new NodeAddedSchedulerEvent(node);
- NodeUpdateSchedulerEvent updateEvent = new NodeUpdateSchedulerEvent(node);
- scheduler.handle(nodeEvent);
- scheduler.handle(updateEvent);
-
- assertEquals(Resource.newInstance(1024, 1), oldQueue.getResourceUsage());
- scheduler.update();
- assertEquals(Resource.newInstance(3072, 3), oldQueue.getDemand());
-
- scheduler.moveApplication(appId, "queue2");
- FSAppAttempt app = scheduler.getSchedulerApp(appAttId);
- assertSame(targetQueue, app.getQueue());
- assertFalse(oldQueue.isRunnableApp(app));
- assertTrue(targetQueue.isRunnableApp(app));
- assertEquals(Resource.newInstance(0, 0), oldQueue.getResourceUsage());
- assertEquals(Resource.newInstance(1024, 1), targetQueue.getResourceUsage());
- assertEquals(0, oldQueue.getNumRunnableApps());
- assertEquals(1, targetQueue.getNumRunnableApps());
- assertEquals(1, queueMgr.getRootQueue().getNumRunnableApps());
-
- scheduler.update();
- assertEquals(Resource.newInstance(0, 0), oldQueue.getDemand());
- assertEquals(Resource.newInstance(3072, 3), targetQueue.getDemand());
- }
-
- @Test
- public void testMoveNonRunnableApp() throws Exception {
- scheduler.init(conf);
- scheduler.start();
- scheduler.reinitialize(conf, resourceManager.getRMContext());
-
- QueueManager queueMgr = scheduler.getQueueManager();
- FSLeafQueue oldQueue = queueMgr.getLeafQueue("queue1", true);
- FSLeafQueue targetQueue = queueMgr.getLeafQueue("queue2", true);
- scheduler.getAllocationConfiguration().queueMaxApps.put("root.queue1", 0);
- scheduler.getAllocationConfiguration().queueMaxApps.put("root.queue2", 0);
-
- ApplicationAttemptId appAttId =
- createSchedulingRequest(1024, 1, "queue1", "user1", 3);
-
- assertEquals(0, oldQueue.getNumRunnableApps());
- scheduler.moveApplication(appAttId.getApplicationId(), "queue2");
- assertEquals(0, oldQueue.getNumRunnableApps());
- assertEquals(0, targetQueue.getNumRunnableApps());
- assertEquals(0, queueMgr.getRootQueue().getNumRunnableApps());
- }
-
- @Test
- public void testMoveMakesAppRunnable() throws Exception {
- scheduler.init(conf);
- scheduler.start();
- scheduler.reinitialize(conf, resourceManager.getRMContext());
-
- QueueManager queueMgr = scheduler.getQueueManager();
- FSLeafQueue oldQueue = queueMgr.getLeafQueue("queue1", true);
- FSLeafQueue targetQueue = queueMgr.getLeafQueue("queue2", true);
- scheduler.getAllocationConfiguration().queueMaxApps.put("root.queue1", 0);
-
- ApplicationAttemptId appAttId =
- createSchedulingRequest(1024, 1, "queue1", "user1", 3);
-
- FSAppAttempt app = scheduler.getSchedulerApp(appAttId);
- assertTrue(oldQueue.isNonRunnableApp(app));
-
- scheduler.moveApplication(appAttId.getApplicationId(), "queue2");
- assertFalse(oldQueue.isNonRunnableApp(app));
- assertFalse(targetQueue.isNonRunnableApp(app));
- assertTrue(targetQueue.isRunnableApp(app));
- assertEquals(1, targetQueue.getNumRunnableApps());
- assertEquals(1, queueMgr.getRootQueue().getNumRunnableApps());
- }
@Test (expected = YarnException.class)
public void testMoveWouldViolateMaxAppsConstraints() throws Exception {