Author: matei
Date: Mon Mar 23 17:21:23 2009
New Revision: 757459
URL: http://svn.apache.org/viewvc?rev=757459&view=rev
Log:
HADOOP-4788. Set mapred.fairscheduler.assignmultiple to true by default. (matei)
Modified:
hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
hadoop/core/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
Modified:
hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java?rev=757459&r1=757458&r2=757459&view=diff
==============================================================================
---
hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
(original)
+++
hadoop/core/trunk/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java
Mon Mar 23 17:21:23 2009
@@ -134,7 +134,7 @@
weightAdjClass, conf);
}
assignMultiple = conf.getBoolean("mapred.fairscheduler.assignmultiple",
- false);
+ true);
sizeBasedWeight = conf.getBoolean("mapred.fairscheduler.sizebasedweight",
false);
initialized = true;
Modified:
hadoop/core/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java?rev=757459&r1=757458&r2=757459&view=diff
==============================================================================
---
hadoop/core/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java
(original)
+++
hadoop/core/trunk/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java
Mon Mar 23 17:21:23 2009
@@ -243,6 +243,7 @@
conf = new JobConf();
conf.set("mapred.fairscheduler.allocation.file", ALLOC_FILE);
conf.set("mapred.fairscheduler.poolnameproperty", POOL_PROPERTY);
+ conf.set("mapred.fairscheduler.assignmultiple", "false");
taskTrackerManager = new FakeTaskTrackerManager();
clock = new FakeClock();
scheduler = new FairScheduler(clock, false);
Modified:
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/docs/src/documentation/content/xdocs/fair_scheduler.xml?rev=757459&r1=757458&r2=757459&view=diff
==============================================================================
---
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
(original)
+++
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
Mon Mar 23 17:21:23 2009
@@ -189,7 +189,7 @@
<td>
Allows the scheduler to assign both a map task and a reduce task
on each heartbeat, which improves cluster throughput when there
- are many small tasks to run. Boolean value, default: false.
+ are many small tasks to run. Boolean value, default: true.
</td>
</tr>
<tr>
