Repository: ambari Updated Branches: refs/heads/branch-2.5 e75fa1c58 -> 85f4c8152
ADDENDUM. AMBARI-21011. Upgrade Code. Append PATH to YARN config 'yarn.nodemanager.admin-env' for HDP 2.6. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/85f4c815 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/85f4c815 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/85f4c815 Branch: refs/heads/branch-2.5 Commit: 85f4c8152cf6fe8a4587fefdbf2d33fa34f900bd Parents: e75fa1c Author: Swapan Shridhar <[email protected]> Authored: Fri May 12 22:34:41 2017 -0700 Committer: Swapan Shridhar <[email protected]> Committed: Fri May 12 22:34:41 2017 -0700 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 8 ++++++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++ .../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 6 +++++- .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++ .../main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 + .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 8 ++++++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 8 +++++++- .../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 4 ++++ .../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 8 ++++++++ .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 7 +++++++ .../main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 4 ++++ 12 files changed, 65 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/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 d8e2d7d..640deb6 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 @@ -548,6 +548,14 @@ </definition> </changes> </component> + <component name="NODEMANAGER"> + <changes> + <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"> + <type>yarn-site</type> + <insert key="yarn.nodemanager.admin-env" value=",PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:$PATH" insert-type="append" newline-before="false" newline-after="false" /> + </definition> + </changes> + </component> </service> <service name="MAPREDUCE2"> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/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 ca3c193..9b88f92 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 @@ -353,6 +353,12 @@ </task> </execute-stage> + <execute-stage service="YARN" component="NODEMANAGER" title="Apply config changes for YARN NM admin env"> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"> + <summary>Updating YARN NodeManager admin env config</summary> + </task> + </execute-stage> + <!--Yarn Apptimeline server--> <execute-stage service="YARN" component="APP_TIMELINE_SERVER" title="Apply config changes for App timeline server"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixYarnWebServiceUrl"> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/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 cf2c257..dd6624b 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 @@ -790,6 +790,7 @@ <component name="NODEMANAGER"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_add_spark2_yarn_shuffle"/> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"/> </pre-upgrade> <pre-downgrade/> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/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 83a0a1e..2434d2c 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 @@ -332,7 +332,11 @@ <set key="yarn.nodemanager.aux-services" value="mapreduce_shuffle,spark_shuffle,spark2_shuffle"/> <!-- Ideally we need to append spark2_shuffle to the existing value --> </definition> - </changes> + <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"> + <type>yarn-site</type> + <insert key="yarn.nodemanager.admin-env" value=",PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:$PATH" insert-type="append" newline-before="false" newline-after="false" /> + </definition> + </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/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 6e899ee..83524fb 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 @@ -331,6 +331,12 @@ </task> </execute-stage> + <execute-stage service="YARN" component="NODEMANAGER" title="Apply config changes for YARN NM admin env"> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"> + <summary>Updating YARN NodeManager admin env config</summary> + </task> + </execute-stage> + <execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client"> <task xsi:type="configure" id="hdp_2_6_0_0_mapreduce_job_queuename"> <summary>Adding queue customization property</summary> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/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 4e14e83..1cf3e3b 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 @@ -795,6 +795,7 @@ <component name="NODEMANAGER"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_5_0_0_add_spark2_yarn_shuffle"/> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"/> </pre-upgrade> <pre-downgrade/> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/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 35f92a7..c7b9f4f 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 @@ -207,6 +207,14 @@ </definition> </changes> </component> + <component name="NODEMANAGER"> + <changes> + <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"> + <type>yarn-site</type> + <insert key="yarn.nodemanager.admin-env" value=",PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:$PATH" insert-type="append" newline-before="false" newline-after="false" /> + </definition> + </changes> + </component> </service> <service name="MAPREDUCE2"> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/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 befc38b..60f1652 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 @@ -338,11 +338,17 @@ </task> </execute-stage> + <execute-stage service="YARN" component="NODEMANAGER" title="Apply config changes for YARN NM admin env"> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"> + <summary>Updating YARN NM admin env config</summary> + </task> + </execute-stage> + <execute-stage> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixCapacitySchedulerOrderingPolicy"> <summary>Validate Root Queue Ordering Policy</summary> </task> - </execute-stage> + </execute-stage> <!--Yarn Apptimeline server--> <execute-stage service="YARN" component="APP_TIMELINE_SERVER" title="Apply config changes for App timeline server"> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/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 3054ca3..fb854b9 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 @@ -721,6 +721,10 @@ </component> <component name="NODEMANAGER"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"/> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml index a6b7523..628c119 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml @@ -117,6 +117,14 @@ </definition> </changes> </component> + <component name="NODEMANAGER"> + <changes> + <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"> + <type>yarn-site</type> + <insert key="yarn.nodemanager.admin-env" value=",PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:$PATH" insert-type="append" newline-before="false" newline-after="false" /> + </definition> + </changes> + </component> </service> <service name="KAFKA"> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml index db845bd..f844f98 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml @@ -327,6 +327,13 @@ <task xsi:type="configure" id="hdp_2_6_yarn_preemption"/> </execute-stage> + <!-- YARN --> + <execute-stage service="YARN" component="NODEMANAGER" title="Apply config changes for YARN NM admin env"> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"> + <summary>Updating YARN NodeManager admin env config</summary> + </task> + </execute-stage> + <!-- KAFKA --> <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes for Ranger Kafka plugin"> <task xsi:type="configure" id="hdp_2_6_maint_ranger_kafka_plugin_cluster_name"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/85f4c815/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml index 35d3da2..ceb5b84 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml @@ -695,6 +695,10 @@ </component> <component name="NODEMANAGER"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"/> + </pre-upgrade> + <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> <upgrade> <task xsi:type="restart-task" /> </upgrade>
