Repository: ambari Updated Branches: refs/heads/branch-2.5 63bdbcac5 -> 9e0a7fbe2
AMBARI-21572. Spark configuration mismatch post express upgrade Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9e0a7fbe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9e0a7fbe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9e0a7fbe Branch: refs/heads/branch-2.5 Commit: 9e0a7fbe246106f729fdabcca633fe509b5491bd Parents: 63bdbca Author: Attila Doroszlai <[email protected]> Authored: Wed Jul 26 15:42:38 2017 +0200 Committer: Attila Doroszlai <[email protected]> Committed: Mon Jul 31 09:24:47 2017 +0200 ---------------------------------------------------------------------- .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 4 +++- .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9e0a7fbe/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index f4068a2..52a6cdc 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -283,9 +283,11 @@ <service name="SPARK2"> <component name="SPARK2_CLIENT"> <changes> - <definition xsi:type="configure" id="hdp_2_6_0_0_spark2_yarn_queue"> + <definition xsi:type="configure" id="hdp_2_6_0_0_spark2_defaults"> <type>spark2-defaults</type> <set key="spark.yarn.queue" value="default" if-type="spark-defaults" if-key="spark.yarn.queue" if-key-state="absent"/> + <transfer operation="delete" delete-key="spark.yarn.archive"/> + <transfer operation="delete" delete-key="spark.thriftserver.ui.port"/> </definition> </changes> </component> http://git-wip-us.apache.org/repos/asf/ambari/blob/9e0a7fbe/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 93f88d9..1fe0382 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -351,10 +351,8 @@ <!-- SPARK2 --> <execute-stage service="SPARK2" component="SPARK2_CLIENT" title="Apply config changes for Spark"> - <task xsi:type="configure" id="hdp_2_6_0_0_spark2_yarn_queue"> - <summary>Add queue customization property</summary> - </task> - </execute-stage> + <task xsi:type="configure" id="hdp_2_6_0_0_spark2_defaults"/> + </execute-stage> </group>
