You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/09/25 20:09:49 UTC
git commit: AMBARI-3341. YARN configuration names changed - modify
stack definition to reflect the change.
Updated Branches:
refs/heads/trunk a9da5b0c2 -> bd0b800ef
AMBARI-3341. YARN configuration names changed - modify stack definition to reflect the change.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/bd0b800e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/bd0b800e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/bd0b800e
Branch: refs/heads/trunk
Commit: bd0b800efb8af2e4e5ff5b1faac43998b4c48088
Parents: a9da5b0
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Wed Sep 25 11:09:27 2013 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Sep 25 11:09:27 2013 -0700
----------------------------------------------------------------------
ambari-server/src/main/python/UpgradeHelper_HDP2.py | 4 ++--
.../HDP/2.0.6/services/YARN/configuration/yarn-site.xml | 7 ++++---
.../2.0.6/services/YARN/configuration/yarn-site.xml | 9 +++++----
3 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/bd0b800e/ambari-server/src/main/python/UpgradeHelper_HDP2.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/UpgradeHelper_HDP2.py b/ambari-server/src/main/python/UpgradeHelper_HDP2.py
index a3d46bf..58504e7 100644
--- a/ambari-server/src/main/python/UpgradeHelper_HDP2.py
+++ b/ambari-server/src/main/python/UpgradeHelper_HDP2.py
@@ -264,8 +264,8 @@ YARN_SITE = {
"yarn.log.server.url": "http://REPLACE_JH_HOST:19888/jobhistory/logs",
"yarn.nodemanager.address": "0.0.0.0:45454",
"yarn.nodemanager.admin-env": "MALLOC_ARENA_MAX=$MALLOC_ARENA_MAX",
- "yarn.nodemanager.aux-services": "mapreduce.shuffle",
- "yarn.nodemanager.aux-services.mapreduce.shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler",
+ "yarn.nodemanager.aux-services": "mapreduce_shuffle",
+ "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler",
"yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor",
"yarn.nodemanager.container-monitor.interval-ms": "3000",
"yarn.nodemanager.delete.debug-delay-sec": "0",
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/bd0b800e/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 b44ac9c..16482fc 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
@@ -130,12 +130,13 @@
<property>
<name>yarn.nodemanager.aux-services</name>
- <value>mapreduce.shuffle</value>
- <description>Auxilliary services of NodeManager</description>
+ <value>mapreduce_shuffle</value>
+ <description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can
+ not start with numbers</description>
</property>
<property>
- <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name>
+ <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
<value>org.apache.hadoop.mapred.ShuffleHandler</value>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/bd0b800e/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 b44ac9c..ae09c21 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
@@ -127,15 +127,16 @@
<value>hadoop</value>
<description>Unix group of the NodeManager</description>
</property>
-
+
<property>
<name>yarn.nodemanager.aux-services</name>
- <value>mapreduce.shuffle</value>
- <description>Auxilliary services of NodeManager</description>
+ <value>mapreduce_shuffle</value>
+ <description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can
+ not start with numbers</description>
</property>
<property>
- <name>yarn.nodemanager.aux-services.mapreduce.shuffle.class</name>
+ <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name>
<value>org.apache.hadoop.mapred.ShuffleHandler</value>
</property>