Author: tomwhite
Date: Wed Nov 28 14:23:32 2012
New Revision: 1414723
URL: http://svn.apache.org/viewvc?rev=1414723&view=rev
Log:
Merge -r 1414654:1414655 from trunk to branch-2. Fixes: YARN-222. Fair
scheduler should create queue for each user by default. Contributed by Sandy
Ryza.
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-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
hadoop/common/branches/branch-2/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
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1414723&r1=1414722&r2=1414723&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed Nov 28
14:23:32 2012
@@ -92,6 +92,9 @@ Release 2.0.3-alpha - Unreleased
YARN-224. Fair scheduler logs too many nodeUpdate INFO messages.
(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
YARN-9. Rename YARN_HOME to HADOOP_YARN_HOME. (vinodkv via acmurthy)
Modified:
hadoop/common/branches/branch-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
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-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?rev=1414723&r1=1414722&r2=1414723&view=diff
==============================================================================
---
hadoop/common/branches/branch-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
(original)
+++
hadoop/common/branches/branch-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
Wed Nov 28 14:23:32 2012
@@ -18,7 +18,7 @@ public class FairSchedulerConfiguration
/** Whether to use the user name as the queue name (instead of "default") if
* the request does not specify a 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 float DEFAULT_LOCALITY_THRESHOLD = -1.0f;
Modified:
hadoop/common/branches/branch-2/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
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/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?rev=1414723&r1=1414722&r2=1414723&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/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
(original)
+++
hadoop/common/branches/branch-2/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
Wed Nov 28 14:23:32 2012
@@ -401,11 +401,11 @@ public class TestFairScheduler {
createAppAttemptId(1, 1), "default", "user1");
scheduler.handle(appAddedEvent1);
- // Scheduler should have one queue (the default)
- assertEquals(1, scheduler.getQueueManager().getQueues().size());
+ // Scheduler should have two queues (the default and the one created for
user1)
+ assertEquals(2, scheduler.getQueueManager().getQueues().size());
// 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(
createAppAttemptId(1, 1), RMAppAttemptState.FINISHED);
@@ -413,8 +413,8 @@ public class TestFairScheduler {
// Now remove app
scheduler.handle(appRemovedEvent1);
- // Default queue should have no apps
- assertEquals(0,
scheduler.getQueueManager().getQueue("default").getApplications().size());
+ // Queue should have no apps
+ assertEquals(0,
scheduler.getQueueManager().getQueue("user1").getApplications().size());
}
@Test
