AMBARI-21065. Update some YARN settings for HDP 2.6 stack (Siddharth Seth via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f7a1d4e7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f7a1d4e7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f7a1d4e7 Branch: refs/heads/ambari-rest-api-explorer Commit: f7a1d4e7e7445eb49cfefabaf92ec518fc44d8ba Parents: 71ed281 Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Thu May 18 21:46:15 2017 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Thu May 18 22:32:31 2017 -0700 ---------------------------------------------------------------------- .../HDP/2.6/services/YARN/configuration/yarn-site.xml | 10 ++++++++++ .../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 5 +++++ .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 7 +++++++ .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 + 4 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f7a1d4e7/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml index 6aa0bae..754a2c2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml @@ -110,4 +110,14 @@ </description> <on-ambari-upgrade add="false"/> </property> + <property> + <name>yarn.nodemanager.kill-escape.launch-command-line</name> + <value>slider-agent,LLAP</value> + <on-ambari-upgrade add="false"/> + </property> + <property> + <name>yarn.nodemanager.kill-escape.user</name> + <value>hive</value> + <on-ambari-upgrade add="false"/> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/f7a1d4e7/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 628c119..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 @@ -123,6 +123,11 @@ <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> http://git-wip-us.apache.org/repos/asf/ambari/blob/f7a1d4e7/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 f844f98..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 @@ -334,6 +334,13 @@ </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> + </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/f7a1d4e7/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 ceb5b84..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 @@ -697,6 +697,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 --> <upgrade>