Repository: ambari Updated Branches: refs/heads/trunk 58503bbdc -> 79579989c
AMBARI-15005. Ambari Server upgrade makes unwanted changes to capacity-scheduler.xml.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/79579989 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/79579989 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/79579989 Branch: refs/heads/trunk Commit: 79579989c626637669342ced59baaece49dd381a Parents: 58503bb Author: Vitaly Brodetskyi <[email protected]> Authored: Sun Mar 6 21:45:25 2016 +0200 Committer: Vitaly Brodetskyi <[email protected]> Committed: Sun Mar 6 21:45:25 2016 +0200 ---------------------------------------------------------------------- .../2.1.0.2.0/configuration/capacity-scheduler.xml | 13 +++++++++++++ .../services/YARN/configuration/capacity-scheduler.xml | 3 +++ 2 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/79579989/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml index 6c21848..f0ab8e1 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml @@ -23,6 +23,7 @@ <description> Maximum number of applications that can be pending and running. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -33,6 +34,7 @@ application masters i.e. controls number of concurrent running applications. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -41,6 +43,7 @@ <description> The queues at the this level (root is the root queue). </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -52,12 +55,14 @@ The child queues capacity should add up to their parent queue's capacity or less. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> <name>yarn.scheduler.capacity.root.default.capacity</name> <value>100</value> <description>Default queue target capacity.</description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -66,6 +71,7 @@ <description> Default queue user limit a percentage from 0.0 to 1.0. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -74,6 +80,7 @@ <description> The maximum capacity of the default queue. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -82,6 +89,7 @@ <description> The state of the default queue. State can be one of RUNNING or STOPPED. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -90,6 +98,7 @@ <description> The ACL of who can submit jobs to the default queue. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -98,6 +107,7 @@ <description> The ACL of who can administer jobs on the default queue. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -107,6 +117,7 @@ The ACL for who can administer this queue i.e. change sub-queue allocations. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -118,6 +129,7 @@ Typically this should be set to number of nodes in the cluster, By default is setting approximately number of nodes in one rack which is 40. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> @@ -126,6 +138,7 @@ <description> Default minimum queue resource limit depends on the number of users who have submitted applications. </description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/79579989/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml index bac8c52..28f5dc2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/capacity-scheduler.xml @@ -34,16 +34,19 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> <name>yarn.scheduler.capacity.root.accessible-node-labels</name> <value>*</value> <description></description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> <property> <name>yarn.scheduler.capacity.root.default-node-label-expression</name> <value> </value> <description></description> + <property-type>DONT_ADD_ON_UPGRADE</property-type> </property> </configuration>
