Revert "ADDENDUM. AMBARI-21011. Upgrade Code. Append PATH to YARN config 'yarn.nodemanager.admin-env' for HDP 2.6."
This reverts commit d0a5cd4a6b22f0c8e02bb7ceb2d5de11314f542a. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a61f985 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a61f985 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a61f985 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 0a61f9857ec95162801fc2c8aae05fef67fbbd52 Parents: d740384 Author: Swapan Shridhar <sshrid...@hortonworks.com> Authored: Sat May 20 00:28:27 2017 -0700 Committer: Swapan Shridhar <sshrid...@hortonworks.com> Committed: Sat May 20 00:29:40 2017 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 8 -------- .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 ------ .../resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 - .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 6 +----- .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 ------ .../resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 - .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 8 -------- .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 ------ .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 4 ---- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 13 ------------- .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 7 ------- .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 - 12 files changed, 1 insertion(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/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 98bb056..8b5c07d 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 @@ -546,14 +546,6 @@ </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/0a61f985/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 4d2b3ec..5aa08c5 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,12 +353,6 @@ </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/0a61f985/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 f1dd943..d98bb53 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 @@ -789,7 +789,6 @@ <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/0a61f985/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 b448a2d..b3d19d4 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,11 +332,7 @@ <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> - <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> + </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/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 4920f12..4a2a502 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,12 +331,6 @@ </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/0a61f985/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 6acedc9..1eb9836 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 @@ -794,7 +794,6 @@ <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/0a61f985/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 61bd581..88b8a35 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 @@ -206,14 +206,6 @@ </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/0a61f985/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 d617a31..8c659ee 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 @@ -345,12 +345,6 @@ </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> http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/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 fb854b9..3054ca3 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,10 +721,6 @@ </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/0a61f985/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 a8ac1bc..a6b7523 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,19 +117,6 @@ </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> - <definition xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_llap_mem"> - <type>yarn-site</type> - <set key="yarn.nodemanager.kill-escape.launch-command-line" value="slider-agent,LLAP"/> - <set key="yarn.nodemanager.kill-escape.user" value="hive"/> - </definition> - </changes> - </component> </service> <service name="KAFKA"> http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/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 ae7ffc5..1cdd184 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 @@ -328,13 +328,6 @@ </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> - - <!-- YARN --> <execute-stage service="YARN" component="NODEMANAGER" title="Apply config changes for YARN NM"> <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_llap_mem"> <summary>Updating YARN NodeManager config for LLAP</summary> http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/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 c2ae825..3e7e3d7 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 @@ -696,7 +696,6 @@ <component name="NODEMANAGER"> <pre-upgrade> - <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_admin_env"/> <task xsi:type="configure" id="hdp_2_6_0_0_yarn_nodemanager_llap_mem"/> </pre-upgrade> <pre-downgrade/> <!-- no-op to prevent config changes on downgrade -->