AMBARI-19951. Set "yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled" property value during RU/EU to HDP2.6 (dgrinenko via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc9788af Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc9788af Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc9788af Branch: refs/heads/branch-feature-AMBARI-12556 Commit: fc9788af1d5c9533de5961e5bc97cf46b2a98b44 Parents: 41034aa Author: Lisnichenko Dmitro <[email protected]> Authored: Fri Feb 10 15:16:53 2017 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Fri Feb 10 15:16:53 2017 +0200 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 7 +++++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++ .../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 7 +++++++ .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 7 +++++++ .../main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 + .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 7 +++++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 7 +++++++ .../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 + 9 files changed, 44 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml index eac318e..478f9b4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml @@ -511,6 +511,13 @@ <type>yarn-env</type> <insert key="content" value="{% if rm_security_opts is defined %} YARN_OPTS="{{rm_security_opts}} $YARN_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" /> </definition> + <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption"> + <type>yarn-site</type> + <transfer operation="copy" + from-key="yarn.resourcemanager.scheduler.monitor.enable" + to-key="yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled" + default-value="false"/> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml index 8da11ff..0d4e3b8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml @@ -319,6 +319,12 @@ </task> </execute-stage> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for Resource Manager"> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption"> + <summary>Updating underutilized_preemption setting</summary> + </task> + </execute-stage> + <execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"> <summary>Verifying LZO codec path for mapreduce</summary> http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml index 01fc102..58db4a9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml @@ -762,6 +762,7 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" /> <task xsi:type="configure" id="yarn_log4j_parameterize" /> <task xsi:type="configure" id="yarn_env_security_opts" /> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml index cc50ac5..18f5fa1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml @@ -297,6 +297,13 @@ <type>yarn-env</type> <insert key="content" value="{% if rm_security_opts is defined %} YARN_OPTS="{{rm_security_opts}} $YARN_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" /> </definition> + <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption"> + <type>yarn-site</type> + <transfer operation="copy" + from-key="yarn.resourcemanager.scheduler.monitor.enable" + to-key="yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled" + default-value="false"/> + </definition> </changes> </component> http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml index 046904b..eedf98c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml @@ -293,6 +293,13 @@ <task xsi:type="configure" id="hdp_2_5_0_0_add_spark2_yarn_shuffle"/> </execute-stage> + <!--Yarn--> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for Resource Manager"> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption"> + <summary>Updating underutilized_preemption setting</summary> + </task> + </execute-stage> + <!--TEZ--> <execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"> http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml index 70bb2ca..392e0fa 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml @@ -767,6 +767,7 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_ranger_yarn_audit_db" /> <task xsi:type="configure" id="yarn_log4j_parameterize" /> <task xsi:type="configure" id="yarn_env_security_opts" /> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption" /> </pre-upgrade> <pre-downgrade /> <!-- no-op to prevent config changes on downgrade --> http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml index a5bfcf6..100df8f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml @@ -139,6 +139,13 @@ <type>yarn-env</type> <insert key="content" value="{% if rm_security_opts is defined %} YARN_OPTS="{{rm_security_opts}} $YARN_OPTS" {% endif %}" insert-type="append" newline-before="true" newline-after="true" /> </definition> + <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption"> + <type>yarn-site</type> + <transfer operation="copy" + from-key="yarn.resourcemanager.scheduler.monitor.enable" + to-key="yarn.scheduler.capacity.ordering-policy.priority-utilization.underutilized-preemption.enabled" + default-value="false"/> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml index 5b8351b..6e92141 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml @@ -298,6 +298,13 @@ </task> </execute-stage> + <!--Yarn--> + <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for Resource Manager"> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption"> + <summary>Updating underutilized_preemption setting</summary> + </task> + </execute-stage> + <!--TEZ--> <execute-stage service="TEZ" component="TEZ_CLIENT" title="Verify LZO codec path for Tez"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"> http://git-wip-us.apache.org/repos/asf/ambari/blob/fc9788af/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml index 2f07c97..bc68754 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml @@ -669,6 +669,7 @@ <pre-upgrade> <task xsi:type="configure" id="yarn_log4j_parameterize" /> <task xsi:type="configure" id="yarn_env_security_opts" /> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_priority_utilization_underutilized_preemption" /> </pre-upgrade> <pre-downgrade /> <upgrade>
