Repository: ambari Updated Branches: refs/heads/branch-2.5 fb744009e -> 28e7fb579
AMBARI-21598. Spark Thrift Server stopped after upgrade due to undefined port Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/28e7fb57 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/28e7fb57 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/28e7fb57 Branch: refs/heads/branch-2.5 Commit: 28e7fb579fb5f2051c0291c43bec418f72f8c193 Parents: fb74400 Author: Attila Doroszlai <[email protected]> Authored: Fri Jul 28 14:50:26 2017 +0200 Committer: Attila Doroszlai <[email protected]> Committed: Fri Jul 28 19:45:16 2017 +0200 ---------------------------------------------------------------------- .../BigInsights/4.2/upgrades/config-upgrade.xml | 17 +++++++++++++++++ .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 8 ++++++++ 2 files changed, 25 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/28e7fb57/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index a3b190f..e8ccc22 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -280,6 +280,23 @@ </changes> </component> </service> + + <service name="SPARK"> + <component name="SPARK_THRIFTSERVER"> + <changes> + <definition xsi:type="configure" id="biginsights_4_2_spark_hive_site_override" summary="Update spark-hive-site-override"> + <type>spark-hive-site-override</type> + <transfer operation="copy" to-key="hive.server2.thrift.port" from-type="spark-env" from-key="spark_thriftserver_port" if-type="spark-env" if-key="spark_thriftserver_port" if-key-state="present" /> + </definition> + <definition xsi:type="configure" id="biginsights_4_2_spark_env" summary="Update spark-env"> + <type>spark-env</type> + <replace key="content" find="export HIVE_SERVER2_THRIFT_BIND_HOST={{spark_thrift_server_host}}" replace-with="" /> + <replace key="content" find="export HIVE_SERVER2_THRIFT_PORT={{spark_thriftserver_port}}" replace-with="" /> + <transfer operation="delete" delete-key="spark_thriftserver_port" /> + </definition> + </changes> + </component> + </service> </services> http://git-wip-us.apache.org/repos/asf/ambari/blob/28e7fb57/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 5532248..ed6414d 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -269,6 +269,14 @@ <task xsi:type="configure" id="biginsights_4_2_webhcat_server_update_configurations" /> </execute-stage> + <!-- SPARK --> + <execute-stage service="SPARK" component="SPARK_THRIFTSERVER" title="Apply config changes for Spark Thrift server"> + <task xsi:type="configure" id="biginsights_4_2_spark_hive_site_override" /> + </execute-stage> + <execute-stage service="SPARK" component="SPARK_THRIFTSERVER" title="Apply config changes for Spark Thrift server"> + <task xsi:type="configure" id="biginsights_4_2_spark_env" /> + </execute-stage> + <!-- OOZIE --> <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie server"> <task xsi:type="configure" id="biginsights_4_2_oozie_server_update_configurations" />
