You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by om...@apache.org on 2011/03/08 07:02:13 UTC
svn commit: r1079267 - in /hadoop/mapreduce/branches/yahoo-merge/src/java:
mapred-default.xml
org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java
Author: omalley
Date: Tue Mar 8 06:02:13 2011
New Revision: 1079267
URL: http://svn.apache.org/viewvc?rev=1079267&view=rev
Log:
commit 6132c7ce62df4764a5f979b7227889e981a7dae5
Author: Greg Roelofs <ro...@yahoo-inc.com>
Date: Fri Feb 18 21:54:05 2011 -0800
trivial pre-checkin whitespace fixes, and re-enable UberTask by default
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/java/mapred-default.xml
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java
Modified: hadoop/mapreduce/branches/yahoo-merge/src/java/mapred-default.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/java/mapred-default.xml?rev=1079267&r1=1079266&r2=1079267&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/java/mapred-default.xml (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/java/mapred-default.xml Tue Mar 8 06:02:13 2011
@@ -557,7 +557,7 @@
<property>
<name>mapreduce.job.ubertask.enable</name>
- <value>false</value>
+ <value>true</value>
<description>Whether to enable the small-jobs "ubertask" optimization,
which runs "sufficiently small" jobs sequentially within a single JVM.
"Small" is defined by the following maxmaps, maxreduces, and maxbytes
Modified: hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java?rev=1079267&r1=1079266&r2=1079267&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java Tue Mar 8 06:02:13 2011
@@ -187,19 +187,19 @@ public static final String OUTDIR = "map
* task-attempt goes. On successful completion of the task-attempt the files
* in the <tt>${mapreduce.output.fileoutputformat.outputdir}/_temporary/_${taskid}</tt>
* (only) are <i>promoted</i> to
- * <tt>${mapreduce.output.fileoutputformat.outputdir}</tt>. Of course, the
+ * <tt>${mapreduce.output.fileoutputformat.outputdir}</tt>. Of course, the
* framework discards the sub-directory of unsuccessful task-attempts. This
* is completely transparent to the application.</p>
*
* <p>The application-writer can take advantage of this by creating any
* side-files required in a work directory during execution
- * of his task, i.e., via
+ * of his task, i.e., via
* {@link #getWorkOutputPath(TaskInputOutputContext)}, and
* the framework will move them out similarly - thus she doesn't have to pick
* unique paths per task-attempt.</p>
*
* <p>The entire discussion holds true for maps of jobs with
- * reducer=NONE (i.e., 0 reduces) since output of the map, in that case,
+ * reducer=NONE (i.e., 0 reduces) since output of the map, in that case,
* goes directly to HDFS.</p>
*
* @return the {@link Path} to the task's temporary output directory