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 2016/12/01 15:46:30 UTC
ambari git commit: AMBARI-18780. Fix livy configuration upgrade from
HDP 2.5 to HDP 2.6 (Jeff Zhang via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 ab6d55234 -> 00c832c47
AMBARI-18780. Fix livy configuration upgrade from HDP 2.5 to HDP 2.6 (Jeff Zhang via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00c832c4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00c832c4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00c832c4
Branch: refs/heads/branch-2.5
Commit: 00c832c472f745c6ed75e82d69dff6b119aef7b5
Parents: ab6d552
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Dec 1 07:46:20 2016 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Dec 1 07:46:20 2016 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 12 ++++++++++++
.../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 ++++
.../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 3 +++
3 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/00c832c4/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 87ede63..9ddb667 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
@@ -44,5 +44,17 @@
</changes>
</component>
</service>
+
+ <service name="SPARK">
+ <component name="LIVY_SERVER">
+ <changes>
+ <definition xsi:type="configure" id="hdp_2_5_0_0_rename_spark_livy_configs">
+ <type>livy-conf</type>
+ <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>
+ </changes>
+ </component>
+ </service>
</services>
</upgrade-config-changes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/00c832c4/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 fc4c8c5..c13ad99 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
@@ -59,6 +59,10 @@
<function>prepare</function>
</task>
</execute-stage>
+
+ <execute-stage service="SPARK" component="LIVY_SERVER" title="Apply config changes for Livy Server">
+ <task xsi:type="configure" id="hdp_2_5_0_0_rename_spark_livy_configs"/>
+ </execute-stage>
</group>
<group xsi:type="stop" name="STOP_HIGH_LEVEL_SERVICE_COMPONENTS" title="Stop Components for High-Level Services">
http://git-wip-us.apache.org/repos/asf/ambari/blob/00c832c4/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 eb4309a..1f7c1a8 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
@@ -761,6 +761,9 @@
</upgrade>
</component>
<component name="LIVY_SERVER">
+ <pre-upgrade>
+ <task xsi:type="configure" id="hdp_2_5_0_0_rename_spark_livy_configs" />
+ </pre-upgrade>
<upgrade>
<task xsi:type="restart-task" />
</upgrade>