big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-222. Fair scheduler should create queue for each user by default. Contributed by Sandy Ryza.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1414655 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2012-11-28 12:53:29 +00:00
parent d9050e1208
commit fcbd55d092
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -109,6 +109,9 @@ Release 2.0.3-alpha - Unreleased
YARN-224. Fair scheduler logs too many nodeUpdate INFO messages. YARN-224. Fair scheduler logs too many nodeUpdate INFO messages.
(Sandy Ryza via tomwhite) (Sandy Ryza via tomwhite)
YARN-222. Fair scheduler should create queue for each user by default.
(Sandy Ryza via tomwhite)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerConfiguration.java
View File

@ -18,7 +18,7 @@ public class FairSchedulerConfiguration extends Configuration {
/** Whether to use the user name as the queue name (instead of "default") if /** Whether to use the user name as the queue name (instead of "default") if
* the request does not specify a queue. */ * the request does not specify a queue. */
protected static final String USER_AS_DEFAULT_QUEUE = CONF_PREFIX + "user-as-default-queue"; protected static final String USER_AS_DEFAULT_QUEUE = CONF_PREFIX + "user-as-default-queue";
protected static final boolean DEFAULT_USER_AS_DEFAULT_QUEUE = false; protected static final boolean DEFAULT_USER_AS_DEFAULT_QUEUE = true;
protected static final String LOCALITY_THRESHOLD = CONF_PREFIX + "locality.threshold"; protected static final String LOCALITY_THRESHOLD = CONF_PREFIX + "locality.threshold";
protected static final float DEFAULT_LOCALITY_THRESHOLD = -1.0f; protected static final float DEFAULT_LOCALITY_THRESHOLD = -1.0f;

10
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
View File

@ -401,11 +401,11 @@ public void testAppAdditionAndRemoval() throws Exception {
createAppAttemptId(1, 1), "default", "user1"); createAppAttemptId(1, 1), "default", "user1");
scheduler.handle(appAddedEvent1); scheduler.handle(appAddedEvent1);
// Scheduler should have one queue (the default) // Scheduler should have two queues (the default and the one created for user1)
assertEquals(1, scheduler.getQueueManager().getQueues().size()); assertEquals(2, scheduler.getQueueManager().getQueues().size());
// That queue should have one app // That queue should have one app
assertEquals(1, scheduler.getQueueManager().getQueue("default").getApplications().size()); assertEquals(1, scheduler.getQueueManager().getQueue("user1").getApplications().size());
AppRemovedSchedulerEvent appRemovedEvent1 = new AppRemovedSchedulerEvent( AppRemovedSchedulerEvent appRemovedEvent1 = new AppRemovedSchedulerEvent(
createAppAttemptId(1, 1), RMAppAttemptState.FINISHED); createAppAttemptId(1, 1), RMAppAttemptState.FINISHED);
@ -413,8 +413,8 @@ public void testAppAdditionAndRemoval() throws Exception {
// Now remove app // Now remove app
scheduler.handle(appRemovedEvent1); scheduler.handle(appRemovedEvent1);
// Default queue should have no apps // Queue should have no apps
assertEquals(0, scheduler.getQueueManager().getQueue("default").getApplications().size()); assertEquals(0, scheduler.getQueueManager().getQueue("user1").getApplications().size());
} }
@Test @Test