You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by di...@apache.org on 2016/06/15 21:14:50 UTC
ambari git commit: Revert "AMBARI-16907 Ambari web UI does not
auto-set all required properties when user toggles on the Yarn CPU isolation
feature on the web UI (dili)"
Repository: ambari
Updated Branches:
refs/heads/trunk 1468737b8 -> 9870d74fb
Revert "AMBARI-16907 Ambari web UI does not auto-set all required properties when user toggles on the Yarn CPU isolation feature on the web UI (dili)"
This reverts commit 757addd2bc1fa92ab8ccd33de57757d1a69ac642.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9870d74f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9870d74f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9870d74f
Branch: refs/heads/trunk
Commit: 9870d74fb8e8e16d9118d063fb04ae87a8d6de7d
Parents: 1468737
Author: Di Li <di...@apache.org>
Authored: Wed Jun 15 17:13:44 2016 -0400
Committer: Di Li <di...@apache.org>
Committed: Wed Jun 15 17:13:44 2016 -0400
----------------------------------------------------------------------
.../services/YARN/configuration/yarn-site.xml | 30 --------------------
.../stacks/HDP/2.2/services/stack_advisor.py | 14 ++++-----
2 files changed, 7 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9870d74f/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
index e1aab8a..d0ee332 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
@@ -187,48 +187,18 @@
<name>yarn.nodemanager.linux-container-executor.resources-handler.class</name>
<value>org.apache.hadoop.yarn.server.nodemanager.util.DefaultLCEResourcesHandler</value>
<description>Pre-requisite to use CGroups</description>
- <depends-on>
- <property>
- <type>yarn-env</type>
- <name>yarn_cgroups_enabled</name>
- </property>
- </depends-on>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.linux-container-executor.cgroups.hierarchy</name>
<value>hadoop-yarn</value>
<description>Name of the Cgroups hierarchy under which all YARN jobs will be launched</description>
- <depends-on>
- <property>
- <type>yarn-env</type>
- <name>yarn_cgroups_enabled</name>
- </property>
- </depends-on>
<on-ambari-upgrade add="true"/>
</property>
<property>
<name>yarn.nodemanager.linux-container-executor.cgroups.mount</name>
<value>false</value>
<description>If true, YARN will automount the CGroup, however the directory needs to already exist; else, the cgroup should be mounted by the admin</description>
- <depends-on>
- <property>
- <type>yarn-env</type>
- <name>yarn_cgroups_enabled</name>
- </property>
- </depends-on>
- <on-ambari-upgrade add="true"/>
- </property>
- <property>
- <name>yarn.nodemanager.linux-container-executor.cgroups.mount-path</name>
- <value>/cgroup</value>
- <description>Path used by the LCE to mount cgroups if not found. This path must exist before the NodeManager is launched.</description>
- <depends-on>
- <property>
- <type>yarn-env</type>
- <name>yarn_cgroups_enabled</name>
- </property>
- </depends-on>
<on-ambari-upgrade add="true"/>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9870d74f/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 038a6c3..22d29e5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -89,17 +89,17 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
yarn_cgroups_enabled = services["configurations"]["yarn-env"]["properties"]["yarn_cgroups_enabled"].lower() == "true"
if yarn_cgroups_enabled:
putYarnProperty('yarn.nodemanager.container-executor.class', 'org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor')
- putYarnProperty('yarn.nodemanager.linux-container-executor.group', 'hadoop')
- putYarnProperty('yarn.nodemanager.linux-container-executor.resources-handler.class', 'org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler')
- putYarnProperty('yarn.nodemanager.linux-container-executor.cgroups.hierarchy', '/yarn')
- putYarnProperty('yarn.nodemanager.linux-container-executor.cgroups.mount', 'true')
+ putYarnProperty('yarn.nodemanager.container-executor.group', 'hadoop')
+ putYarnProperty('yarn.nodemanager.container-executor.resources-handler.class', 'org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler')
+ putYarnProperty('yarn.nodemanager.container-executor.cgroups.hierarchy', ' /yarn')
+ putYarnProperty('yarn.nodemanager.container-executor.cgroups.mount', 'true')
putYarnProperty('yarn.nodemanager.linux-container-executor.cgroups.mount-path', '/cgroup')
else:
if not kerberos_authentication_enabled:
putYarnProperty('yarn.nodemanager.container-executor.class', 'org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor')
- putYarnPropertyAttribute('yarn.nodemanager.linux-container-executor.resources-handler.class', 'delete', 'true')
- putYarnPropertyAttribute('yarn.nodemanager.linux-container-executor.cgroups.hierarchy', 'delete', 'true')
- putYarnPropertyAttribute('yarn.nodemanager.linux-container-executor.cgroups.mount', 'delete', 'true')
+ putYarnPropertyAttribute('yarn.nodemanager.container-executor.resources-handler.class', 'delete', 'true')
+ putYarnPropertyAttribute('yarn.nodemanager.container-executor.cgroups.hierarchy', 'delete', 'true')
+ putYarnPropertyAttribute('yarn.nodemanager.container-executor.cgroups.mount', 'delete', 'true')
putYarnPropertyAttribute('yarn.nodemanager.linux-container-executor.cgroups.mount-path', 'delete', 'true')
# recommend hadoop.registry.rm.enabled based on SLIDER in services
servicesList = [service["StackServices"]["service_name"] for service in services["services"]]