You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2017/04/05 20:00:52 UTC
[2/3] ambari git commit: AMBARI-20556. Add SPARK_CONF_DIR in livy-env
when upgrading from HDP 2.5 to 2.6 (Jeff Zhang via alejandro)
AMBARI-20556. Add SPARK_CONF_DIR in livy-env when upgrading from HDP 2.5 to 2.6 (Jeff Zhang via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7fbec01c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7fbec01c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7fbec01c
Branch: refs/heads/branch-2.5
Commit: 7fbec01c4eb1f947ca03fae4c6f83081cec26f10
Parents: 1730747
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Fri Mar 24 15:48:36 2017 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Apr 5 12:57:01 2017 -0700
----------------------------------------------------------------------
.../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 4 ++++
.../resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 ++++
.../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
3 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7fbec01c/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 4a6e98b..95040aa 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
@@ -75,6 +75,10 @@
<transfer operation="move" from-key="livy.server.kerberos.keytab" to-key="livy.server.launch.kerberos.keytab" />
<transfer operation="move" from-key="livy.server.kerberos.principal" to-key="livy.server.launch.kerberos.principal" />
</definition>
+ <definition xsi:type="configure" id="hdp_2_5_0_0_add_spark_conf_dir_livy_configs">
+ <type>livy-env</type>
+ <insert key="content" value="export SPARK_CONF_DIR=/usr/hdp/current/spark-client/conf" insert-type="append" newline-before="true" newline-after="true" />
+ </definition>
</changes>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7fbec01c/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 97fb768..4c7faf1 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
@@ -564,6 +564,10 @@
<task xsi:type="configure" id="hdp_2_5_0_0_rename_spark_livy_configs"/>
</execute-stage>
+ <execute-stage service="SPARK" component="LIVY_SERVER" title="Add SPARK_CONF_DIR for Livy Server">
+ <task xsi:type="configure" id="hdp_2_5_0_0_add_spark_conf_dir_livy_configs"/>
+ </execute-stage>
+
<execute-stage service="SPARK" component="SPARK_CLIENT" title="Apply config changes for Spark">
<task xsi:type="configure" id="hdp_2_5_0_0_spark_yarn_queue">
<summary>Add queue customization property</summary>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7fbec01c/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 fe25928..11d24c9 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
@@ -881,6 +881,7 @@
<component name="LIVY_SERVER">
<pre-upgrade>
<task xsi:type="configure" id="hdp_2_5_0_0_rename_spark_livy_configs" />
+ <task xsi:type="configure" id="hdp_2_5_0_0_add_spark_conf_dir_livy_configs" />
</pre-upgrade>
<pre-downgrade />