Updated Branches: refs/heads/trunk 2b0048b8e -> 2339fa99c
AMBARI-3462. Update mapred-site and yarn-site config based on mapred-default. (swagle) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2339fa99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2339fa99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2339fa99 Branch: refs/heads/trunk Commit: 2339fa99c270fcadf104d75e149fb00093e4af94 Parents: 2b0048b Author: Siddharth Wagle <[email protected]> Authored: Fri Oct 4 14:52:32 2013 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Fri Oct 4 14:52:32 2013 -0700 ---------------------------------------------------------------------- .../MAPREDUCE2/configuration/mapred-site.xml | 26 +++++++++----- .../services/YARN/configuration/yarn-site.xml | 38 ++++++++------------ .../MAPREDUCE2/configuration/mapred-site.xml | 26 +++++++++----- .../services/YARN/configuration/yarn-site.xml | 12 ++----- 4 files changed, 51 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2339fa99/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml index a153377..0c99dc1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml @@ -26,7 +26,7 @@ <property> <name>mapreduce.task.io.sort.mb</name> - <value>100</value> + <value>200</value> <description> The total amount of buffer memory to use while sorting files, in megabytes. By default, gives each merge stream 1MB, which should minimize seeks. @@ -35,7 +35,7 @@ <property> <name>mapreduce.map.sort.spill.percent</name> - <value>0.1</value> + <value>0.7</value> <description> The soft limit in the serialization buffer. Once reached, a thread will begin to spill the contents to disk in the background. Note that @@ -150,12 +150,12 @@ <!-- copied from kryptonite configuration --> <property> <name>mapreduce.map.output.compress</name> - <value></value> + <value>false</value> </property> <property> <name>mapreduce.task.timeout</name> - <value>600000</value> + <value>300000</value> <description> The number of milliseconds before a task will be terminated if it neither reads an input, writes an output, nor @@ -165,7 +165,7 @@ <property> <name>mapreduce.map.memory.mb</name> - <value>512</value> + <value>1024</value> </property> <property> @@ -237,13 +237,13 @@ <property> <name>yarn.app.mapreduce.am.resource.mb</name> - <value>1024</value> + <value>512</value> <description>The amount of memory the MR AppMaster needs.</description> </property> <property> <name>yarn.app.mapreduce.am.command-opts</name> - <value>-Xmx756m</value> + <value>-Xmx312m</value> <description> Java opts for the MR App Master processes. The following symbol, if present, will be interpolated: @taskid@ is replaced @@ -323,7 +323,7 @@ <property> <name>mapreduce.map.memory.mb</name> - <value>512</value> + <value>1024</value> <description> Larger resource limit for maps. </description> @@ -331,7 +331,7 @@ <property> <name>mapreduce.map.java.opts</name> - <value>-Xmx320m</value> + <value>-Xmx756m</value> <description> Larger heap-size for child jvms of maps. </description> @@ -381,4 +381,12 @@ </description> </property> + <property> + <name>mapreduce.output.fileoutputformat.compress</name> + <value>false</value> + <description> + Should the job outputs be compressed? + </description> + </property> + </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2339fa99/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml index 2e473a4..4be078a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml @@ -21,7 +21,7 @@ <configuration xmlns:xi="http://www.w3.org/2001/XInclude";> -<!-- ResourceManager --> + <!-- ResourceManager --> <property> <name>yarn.resourcemanager.resource-tracker.address</name> @@ -33,7 +33,7 @@ <value>localhost:8030</value> <description>The address of the scheduler interface.</description> </property> - + <property> <name>yarn.resourcemanager.address</name> <value>localhost:8050</value> @@ -50,8 +50,8 @@ </property> <property> - <name>yarn.resourcemanager.scheduler.class</name> - <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value> + <name>yarn.resourcemanager.scheduler.class</name> + <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value> <description>The class to use as the resource scheduler.</description> </property> @@ -67,25 +67,25 @@ <property> <name>yarn.scheduler.maximum-allocation-mb</name> - <value>6144</value> + <value>2048</value> <description> The maximum allocation for every container request at the RM, in MBs. Memory requests higher than this won't take effect, and will get capped to this value. </description> </property> - + <property> <name>yarn.acl.enable</name> <value>true</value> </property> - + <property> <name>yarn.admin.acl</name> <value>*</value> </property> -<!-- NodeManager --> + <!-- NodeManager --> <property> <name>yarn.nodemanager.address</name> @@ -95,7 +95,7 @@ <property> <name>yarn.nodemanager.resource.memory-mb</name> - <value>10240</value> + <value>5120</value> <description>Amount of physical memory, in MB, that can be allocated for containers.</description> </property> @@ -103,19 +103,19 @@ <property> <name>yarn.application.classpath</name> <value>/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*</value> - <description>Classpath for typical applications.</description> + <description>Classpath for typical applications.</description> </property> <property> <name>yarn.nodemanager.vmem-pmem-ratio</name> <value>2.1</value> <description>Ratio between virtual memory to physical memory when - setting memory limits for containers. Container allocations are - expressed in terms of physical memory, and virtual memory usage - is allowed to exceed this allocation by this ratio. + setting memory limits for containers. Container allocations are + expressed in terms of physical memory, and virtual memory usage + is allowed to exceed this allocation by this ratio. </description> </property> - + <property> <name>yarn.nodemanager.container-executor.class</name> <value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor</value> @@ -127,7 +127,7 @@ <value>hadoop</value> <description>Unix group of the NodeManager</description> </property> - + <property> <name>yarn.nodemanager.aux-services</name> <value>mapreduce_shuffle</value> @@ -309,12 +309,4 @@ </description> </property> - <property> - <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name> - <value>org.apache.hadoop.mapred.ShuffleHandler</value> - <description> - The auxiliary service class to use. - </description> - </property> - </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2339fa99/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml index a7310cd..096c3a7 100644 --- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/MAPREDUCE2/configuration/mapred-site.xml @@ -26,7 +26,7 @@ <property> <name>mapreduce.task.io.sort.mb</name> - <value>100</value> + <value>200</value> <description> The total amount of buffer memory to use while sorting files, in megabytes. By default, gives each merge stream 1MB, which should minimize seeks. @@ -35,7 +35,7 @@ <property> <name>mapreduce.map.sort.spill.percent</name> - <value>0.1</value> + <value>0.7</value> <description> The soft limit in the serialization buffer. Once reached, a thread will begin to spill the contents to disk in the background. Note that @@ -150,12 +150,12 @@ <!-- copied from kryptonite configuration --> <property> <name>mapreduce.map.output.compress</name> - <value></value> + <value>false</value> </property> <property> <name>mapreduce.task.timeout</name> - <value>600000</value> + <value>300000</value> <description> The number of milliseconds before a task will be terminated if it neither reads an input, writes an output, nor @@ -165,7 +165,7 @@ <property> <name>mapreduce.map.memory.mb</name> - <value>512</value> + <value>1024</value> </property> <property> @@ -237,13 +237,13 @@ <property> <name>yarn.app.mapreduce.am.resource.mb</name> - <value>1024</value> + <value>512</value> <description>The amount of memory the MR AppMaster needs.</description> </property> <property> <name>yarn.app.mapreduce.am.command-opts</name> - <value>-Xmx756m</value> + <value>-Xmx312m</value> <description> Java opts for the MR App Master processes. The following symbol, if present, will be interpolated: @taskid@ is replaced @@ -323,7 +323,7 @@ <property> <name>mapreduce.map.memory.mb</name> - <value>512</value> + <value>1024</value> <description> Larger resource limit for maps. </description> @@ -331,7 +331,7 @@ <property> <name>mapreduce.map.java.opts</name> - <value>-Xmx320m</value> + <value>-Xmx756m</value> <description> Larger heap-size for child jvms of maps. </description> @@ -381,4 +381,12 @@ </description> </property> + <property> + <name>mapreduce.output.fileoutputformat.compress</name> + <value>false</value> + <description> + Should the job outputs be compressed? + </description> + </property> + </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2339fa99/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml index c3de13c..4be078a 100644 --- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml @@ -67,7 +67,7 @@ <property> <name>yarn.scheduler.maximum-allocation-mb</name> - <value>6144</value> + <value>2048</value> <description> The maximum allocation for every container request at the RM, in MBs. Memory requests higher than this won't take effect, @@ -95,7 +95,7 @@ <property> <name>yarn.nodemanager.resource.memory-mb</name> - <value>10240</value> + <value>5120</value> <description>Amount of physical memory, in MB, that can be allocated for containers.</description> </property> @@ -309,12 +309,4 @@ </description> </property> - <property> - <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name> - <value>org.apache.hadoop.mapred.ShuffleHandler</value> - <description> - The auxiliary service class to use. - </description> - </property> - </configuration>
