Repository: ambari Updated Branches: refs/heads/branch-1.7.0 2f519d361 -> 4c779b0f9
AMBARI-8111. Fix yarn site configs for RM HA and Node labelling. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c779b0f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c779b0f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c779b0f Branch: refs/heads/branch-1.7.0 Commit: 4c779b0f947cb28c0a247b201135afd005e7f7de Parents: 2f519d3 Author: Mahadev Konar <[email protected]> Authored: Sun Nov 2 12:48:37 2014 -0800 Committer: Mahadev Konar <[email protected]> Committed: Sun Nov 2 12:48:42 2014 -0800 ---------------------------------------------------------------------- .../services/YARN/configuration/yarn-site.xml | 27 +------------------- 1 file changed, 1 insertion(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4c779b0f/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 f689955..7bd1e5a 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 @@ -93,31 +93,6 @@ <description>ACL's to be used for ZooKeeper znodes.</description> </property> <property> - <name>yarn.resourcemanager.zk-state-store.root-node.acl</name> - <value> </value> - <description> - ACLs to be used for the root znode when using ZKRMStateStore in a HA - scenario for fencing. - - ZKRMStateStore supports implicit fencing to allow a single - ResourceManager write-access to the store. For fencing, the - ResourceManagers in the cluster share read-write-admin privileges on the - root node, but the Active ResourceManager claims exclusive create-delete - permissions. - - By default, when this property is not set, we use the ACLs from - yarn.resourcemanager.zk-acl for shared admin access and - rm-address:random-number for username-based exclusive create-delete - access. - - This property allows users to set ACLs of their choice instead of using - the default mechanism. For fencing to work, the ACLs should be - carefully set differently on each ResourceManger such that all the - ResourceManagers have shared admin access and the Active ResourceManger - takes over (exclusively) the create-delete access. - </description> - </property> - <property> <name>yarn.resourcemanager.work-preserving-recovery.scheduling-wait-ms</name> <value>10000</value> <description>Set the amount of time RM waits before allocating new containers on work-preserving-recovery. Such wait period gives RM a chance to settle down resyncing with NMs in the cluster on recovery, before assigning new containers to applications.</description> @@ -203,7 +178,7 @@ </property> <property> <name>yarn.node-labels.manager-class</name> - <value>org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager</value> + <value>org.apache.hadoop.yarn.server.resourcemanager.nodelabels.MemoryRMNodeLabelsManager</value> <description>If user want to enable this feature, specify it to "org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager</description> </property> <property>
