You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/24 02:39:39 UTC
[22/50] [abbrv] ambari git commit: Revert "Revert "ADDENDUM.
AMBARI-21011. Upgrade Code. Append PATH to YARN config
'yarn.nodemanager.admin-env' for HDP 2.6.""
Revert "Revert "ADDENDUM. AMBARI-21011. Upgrade Code. Append PATH to YARN config 'yarn.nodemanager.admin-env' for HDP 2.6.""
This reverts commit 0a61f9857ec95162801fc2c8aae05fef67fbbd52.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ccd6b25e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ccd6b25e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ccd6b25e
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: ccd6b25ed2f053a9b1b2045fd0cf41f4472e657e
Parents: 9ffef7f
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Mon May 22 01:10:15 2017 -0700
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Mon May 22 01:11:15 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, 66 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ccd6b25e/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 8b5c07d..98bb056 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,6 +546,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/ccd6b25e/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 5aa08c5..4d2b3ec 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/ccd6b25e/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 d98bb53..f1dd943 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,6 +789,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/ccd6b25e/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 b3d19d4..b448a2d 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/ccd6b25e/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 4a2a502..4920f12 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/ccd6b25e/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 1eb9836..6acedc9 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,6 +794,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/ccd6b25e/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 a29f74b..4c6cb21 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,6 +206,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/ccd6b25e/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 8c659ee..d617a31 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,6 +345,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 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/ccd6b25e/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/ccd6b25e/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..a8ac1bc 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,19 @@
</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/ccd6b25e/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 1cdd184..ae7ffc5 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,6 +328,13 @@
</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/ccd6b25e/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 3e7e3d7..c2ae825 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,6 +696,7 @@
<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 -->