YARN-278. Fair scheduler maxRunningApps config causes no apps to make progress. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424992 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
cc2c01fc94
commit
15c515f6be
|
@ -129,6 +129,9 @@ Release 2.0.3-alpha - Unreleased
|
|||
YARN-272. Fair scheduler log messages try to print objects without
|
||||
overridden toString methods. (sandyr via tucu)
|
||||
|
||||
YARN-278. Fair scheduler maxRunningApps config causes no apps to make
|
||||
progress. (sandyr via tucu)
|
||||
|
||||
Release 2.0.2-alpha - 2012-09-07
|
||||
|
||||
YARN-9. Rename YARN_HOME to HADOOP_YARN_HOME. (vinodkv via acmurthy)
|
||||
|
|
|
@ -177,8 +177,10 @@ public class FSLeafQueue extends FSQueue {
|
|||
|
||||
Collections.sort(appScheds, comparator);
|
||||
for (AppSchedulable sched: appScheds) {
|
||||
if (sched.getRunnable()) {
|
||||
return sched.assignContainer(node, reserved);
|
||||
}
|
||||
}
|
||||
|
||||
return Resources.none();
|
||||
}
|
||||
|
|
|
@ -162,6 +162,13 @@ public class TestFairScheduler {
|
|||
return id;
|
||||
}
|
||||
|
||||
private void createSchedulingRequestExistingApplication(int memory, int priority, ApplicationAttemptId attId) {
|
||||
List<ResourceRequest> ask = new ArrayList<ResourceRequest>();
|
||||
ResourceRequest request = createResourceRequest(memory, "*", priority, 1);
|
||||
ask.add(request);
|
||||
scheduler.allocate(attId, ask, new ArrayList<ContainerId>());
|
||||
}
|
||||
|
||||
// TESTS
|
||||
|
||||
@Test
|
||||
|
@ -1125,4 +1132,59 @@ public class TestFairScheduler {
|
|||
assertEquals(0,
|
||||
scheduler.applications.get(attId2).getCurrentReservation().getMemory());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUserMaxRunningApps() throws Exception {
|
||||
// Set max running apps
|
||||
Configuration conf = createConfiguration();
|
||||
conf.set(FairSchedulerConfiguration.ALLOCATION_FILE, ALLOC_FILE);
|
||||
scheduler.reinitialize(conf, resourceManager.getRMContext());
|
||||
|
||||
PrintWriter out = new PrintWriter(new FileWriter(ALLOC_FILE));
|
||||
out.println("<?xml version=\"1.0\"?>");
|
||||
out.println("<allocations>");
|
||||
out.println("<user name=\"user1\">");
|
||||
out.println("<maxRunningApps>1</maxRunningApps>");
|
||||
out.println("</user>");
|
||||
out.println("</allocations>");
|
||||
out.close();
|
||||
|
||||
QueueManager queueManager = scheduler.getQueueManager();
|
||||
queueManager.initialize();
|
||||
|
||||
// Add a node
|
||||
RMNode node1 = MockNodes.newNodeInfo(1, Resources.createResource(8192));
|
||||
NodeAddedSchedulerEvent nodeEvent1 = new NodeAddedSchedulerEvent(node1);
|
||||
scheduler.handle(nodeEvent1);
|
||||
|
||||
// Request for app 1
|
||||
ApplicationAttemptId attId1 = createSchedulingRequest(1024, "queue1",
|
||||
"user1", 1);
|
||||
|
||||
scheduler.update();
|
||||
NodeUpdateSchedulerEvent updateEvent = new NodeUpdateSchedulerEvent(node1,
|
||||
new ArrayList<ContainerStatus>(), new ArrayList<ContainerStatus>());
|
||||
scheduler.handle(updateEvent);
|
||||
|
||||
// App 1 should be running
|
||||
assertEquals(1, scheduler.applications.get(attId1).getLiveContainers().size());
|
||||
|
||||
ApplicationAttemptId attId2 = createSchedulingRequest(1024, "queue1",
|
||||
"user1", 1);
|
||||
|
||||
scheduler.update();
|
||||
scheduler.handle(updateEvent);
|
||||
|
||||
// App 2 should not be running
|
||||
assertEquals(0, scheduler.applications.get(attId2).getLiveContainers().size());
|
||||
|
||||
// Request another container for app 1
|
||||
createSchedulingRequestExistingApplication(1024, 1, attId1);
|
||||
|
||||
scheduler.update();
|
||||
scheduler.handle(updateEvent);
|
||||
|
||||
// Request should be fulfilled
|
||||
assertEquals(2, scheduler.applications.get(attId1).getLiveContainers().size());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue