Repository: ambari Updated Branches: refs/heads/trunk c74e0e85d -> b6a67dcbc
AMBARI-11358 - During RU, capacity scheduler config needs to be modified for HDP-2.3 to get rid of bad values (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b6a67dcb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b6a67dcb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b6a67dcb Branch: refs/heads/trunk Commit: b6a67dcbca7386257684f22068f224a016cedd5c Parents: c74e0e8 Author: Jonathan Hurley <[email protected]> Authored: Fri May 22 21:13:40 2015 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Fri May 22 21:29:01 2015 -0400 ---------------------------------------------------------------------- .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b6a67dcb/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml index 6d50008..05aa89f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml @@ -456,10 +456,28 @@ <type>yarn-site</type> <set key="yarn.node-labels.enabled" value="false"/> </task> + <task xsi:type="configure"> <type>capacity-scheduler</type> <set key="yarn.scheduler.capacity.root.default-node-label-expression" value=""/> </task> + + <task xsi:type="configure" summary="Checking the Capacity Scheduler root default capacity"> + <condition type="capacity-scheduler" key="yarn.scheduler.capacity.root.accessible-node-labels.default.capacity" value="-1"> + <type>capacity-scheduler</type> + <key>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</key> + <value>10</value> + </condition> + </task> + + <task xsi:type="configure" summary="Checking the Capacity Scheduler root maximum capacity"> + <condition type="capacity-scheduler" key="yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity" value="-1"> + <type>capacity-scheduler</type> + <key>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</key> + <value>100</value> + </condition> + </task> + </pre-upgrade> <upgrade> <task xsi:type="restart" />
