Updated Branches: refs/heads/trunk 202f18224 -> 4eaec1e2e
AMBARI-3448. Ensure valid default values are used for mapred config properties. (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/4eaec1e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/4eaec1e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/4eaec1e2 Branch: refs/heads/trunk Commit: 4eaec1e2e79b541d612b9d20e117dc33d9fc4240 Parents: 202f182 Author: Siddharth Wagle <[email protected]> Authored: Thu Oct 3 15:57:52 2013 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Thu Oct 3 15:57:52 2013 -0700 ---------------------------------------------------------------------- .../MAPREDUCE2/configuration/mapred-site.xml | 8 +---- .../services/YARN/configuration/yarn-site.xml | 10 +++++- .../MAPREDUCE2/configuration/mapred-site.xml | 12 ++----- .../services/YARN/configuration/yarn-site.xml | 34 ++++++++++++-------- 4 files changed, 34 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4eaec1e2/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 2921a95..a153377 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 @@ -165,7 +165,7 @@ <property> <name>mapreduce.map.memory.mb</name> - <value>1536</value> + <value>512</value> </property> <property> @@ -174,12 +174,6 @@ </property> <property> - <name>mapreduce.tasktracker.keytab.file</name> - <value></value> - <description>The filename of the keytab for the task tracker</description> - </property> - - <property> <name>mapreduce.jobhistory.keytab.file</name> <!-- cluster variant --> <value></value> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4eaec1e2/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 8497b58..2e473a4 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 @@ -173,7 +173,7 @@ </description> </property> - <!-- + <!-- <property> <name>yarn.nodemanager.health-checker.script.path</name> <value>/etc/hadoop/conf/health_check_nodemanager</value> @@ -309,4 +309,12 @@ </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/4eaec1e2/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 2921a95..a7310cd 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 @@ -22,7 +22,7 @@ <configuration xmlns:xi="http://www.w3.org/2001/XInclude";> -<!-- i/o properties --> + <!-- i/o properties --> <property> <name>mapreduce.task.io.sort.mb</name> @@ -54,7 +54,7 @@ </description> </property> -<!-- map/reduce properties --> + <!-- map/reduce properties --> <property> <name>mapreduce.cluster.administrators</name> <value> hadoop</value> @@ -165,7 +165,7 @@ <property> <name>mapreduce.map.memory.mb</name> - <value>1536</value> + <value>512</value> </property> <property> @@ -174,12 +174,6 @@ </property> <property> - <name>mapreduce.tasktracker.keytab.file</name> - <value></value> - <description>The filename of the keytab for the task tracker</description> - </property> - - <property> <name>mapreduce.jobhistory.keytab.file</name> <!-- cluster variant --> <value></value> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4eaec1e2/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 2b37bd0..c3de13c 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 @@ -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> @@ -74,18 +74,18 @@ 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> @@ -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> @@ -173,7 +173,7 @@ </description> </property> - <!-- + <!-- <property> <name>yarn.nodemanager.health-checker.script.path</name> <value>/etc/hadoop/conf/health_check_nodemanager</value> @@ -309,4 +309,12 @@ </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>
