Repository: ambari Updated Branches: refs/heads/trunk 9bb5e4aa4 -> fc6bab15d
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/fc6bab15 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc6bab15 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc6bab15 Branch: refs/heads/trunk Commit: fc6bab15def8f485496deaea2e7e5725c8d5a895 Parents: 9bb5e4a Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Fri Mar 24 15:48:36 2017 -0700 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Fri Mar 24 15:49:11 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/fc6bab15/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 19b55ec..941e28a 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 @@ -82,6 +82,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> <component name="SPARK_CLIENT"> http://git-wip-us.apache.org/repos/asf/ambari/blob/fc6bab15/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 063b362..5ee6ba4 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 @@ -562,6 +562,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/fc6bab15/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 e637c4c..7c31e57 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 @@ -865,6 +865,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 />
