Author: tucu
Date: Wed Apr 17 23:15:22 2013
New Revision: 1469096
URL: http://svn.apache.org/r1469096
Log:
MAPREDUCE-5128. mapred-default.xml is missing a bunch of history server
configs. (sandyr via tucu)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1469096&r1=1469095&r2=1469096&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed
Apr 17 23:15:22 2013
@@ -152,6 +152,9 @@ Release 2.0.5-beta - UNRELEASED
MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas)
+ MAPREDUCE-5128. mapred-default.xml is missing a bunch of history server
+ configs. (sandyr via tucu)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1469096&r1=1469095&r2=1469096&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Wed Apr 17 23:15:22 2013
@@ -586,6 +586,14 @@
<description>The max percent (0-1) of running tasks that
can be speculatively re-executed at any time.</description>
</property>
+
+<property>
+ <name>mapreduce.job.map.output.collector.class</name>
+ <value>org.apache.hadoop.mapred.MapTask$MapOutputBuffer</value>
+ <description>
+ It defines the MapOutputCollector implementation to use.
+ </description>
+</property>
<property>
<name>mapreduce.job.speculative.slowtaskthreshold</name>
@@ -1471,11 +1479,89 @@
</property>
<property>
- <name>mapreduce.job.map.output.collector.class</name>
- <value>org.apache.hadoop.mapred.MapTask$MapOutputBuffer</value>
- <description>
- It defines the MapOutputCollector implementation to use.
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>${yarn.app.mapreduce.am.staging-dir}/history/done_intermediate</value>
+ <description></description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>${yarn.app.mapreduce.am.staging-dir}/history/done</value>
+ <description></description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.cleaner.enable</name>
+ <value>true</value>
+ <description></description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.cleaner.interval-ms</name>
+ <value>86400000</value>
+ <description> How often the job history cleaner checks for files to delete,
+ in milliseconds. Defaults to 86400000 (one day). Files are only deleted if
+ they are older than mapreduce.jobhistory.max-age-ms.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.max-age-ms</name>
+ <value>604800000</value>
+ <description> Job history files older than this many milliseconds will
+ be deleted when the history cleaner runs. Defaults to 604800000 (1 week).
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.client.thread-count</name>
+ <value>10</value>
+ <description>The number of threads to handle client API
requests</description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.datestring.cache.size</name>
+ <value>200000</value>
+ <description>Size of the date string cache. Effects the number of directories
+ which will be scanned to find a job.</description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.joblist.cache.size</name>
+ <value>20000</value>
+ <description>Size of the job list cache</description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.loadedjobs.cache.size</name>
+ <value>5</value>
+ <description>Size of the loaded job cache</description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.move.interval-ms</name>
+ <value>180000</value>
+ <description>Scan for history files to more from intermediate done dir to
done
+ dir at this frequency.
</description>
</property>
+<property>
+ <name>mapreduce.jobhistory.move.thread-count</name>
+ <value>3</value>
+ <description>The number of threads used to move files.</description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.store.class</name>
+ <value></value>
+ <description>The HistoryStorage class to use to cache history
data.</description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.minicluster.fixed.ports</name>
+ <value>false</value>
+ <description>Whether to use fixed ports with the minicluster</description>
+</property>
+
</configuration>
