Repository: ambari Updated Branches: refs/heads/trunk 941bc1685 -> bb6f0d2c8
AMBARI-21973. Set tez.runtime.shuffle.ssl.enable=false in Ambari for HSI.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb6f0d2c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb6f0d2c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb6f0d2c Branch: refs/heads/trunk Commit: bb6f0d2c89adf17894caa995da65e7e09f714434 Parents: 941bc16 Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Mon Sep 18 21:09:06 2017 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Mon Sep 18 21:09:06 2017 +0300 ---------------------------------------------------------------------- .../services/HIVE/configuration/tez-interactive-site.xml | 11 +++++++++++ .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 5 +++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 7 +++++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++ .../resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 4 ++++ .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 + .../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 8 ++++++++ .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 6 ++++++ .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 4 ++++ 9 files changed, 52 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6f0d2c/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml index c1a42b0..fb4a6b0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml @@ -183,4 +183,15 @@ <value>8</value> <on-ambari-upgrade add="false"/> </property> + <property> + <name>tez.runtime.shuffle.ssl.enable</name> + <value>false</value> + <value-attributes> + <type>boolean</type> + <overridable>false</overridable> + <editable-only-at-install>true</editable-only-at-install> + </value-attributes> + <final>true</final> + <on-ambari-upgrade add="true"/> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6f0d2c/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 bd69f1e..cf42e93 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 @@ -512,6 +512,11 @@ <set key="tez.runtime.shuffle.read.timeout" value="30000"/> </definition> + <definition xsi:type="configure" id="llap_update_tez_shuffle_ssl_enable" summary="Update additional LLAP-Tez settings"> + <type>tez-interactive-site</type> + <set key="tez.runtime.shuffle.ssl.enable" value="false"/> + </definition> + <definition xsi:type="configure" id="hdp_2_6_0_0_copy_hive_tez_container_size_to_hiveInteractive"> <type>hive-interactive-site</type> <transfer operation="copy" from-type="hive-site" from-key="hive.tez.container.size" to-key="hive.tez.container.size" default-value="682" if-type="hive-interactive-site" if-key="hive.tez.container.size" if-key-state="absent"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6f0d2c/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml index b25db24..4d514ac 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml @@ -302,12 +302,19 @@ </task> </execute-stage> + <!-- HIVE --> <execute-stage service="HIVE" component="HIVE_SERVER" title="Updating Hive properties"> <task xsi:type="configure" id="hdp_2_5_0_0_remove_atlas_cluster_name"> <summary>Removing atlas.cluster.name property</summary> </task> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update additional LLAP-Tez settings"> + <task xsi:type="configure" id="llap_update_tez_shuffle_ssl_enable"> + <summary>Update tez.runtime.shuffle.ssl.enable property</summary> + </task> + </execute-stage> + <!-- STORM --> <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Storm"> <task xsi:type="configure" id="hdp_2_5_0_0_remove_empty_storm_topology_submission_notifier_plugin_class"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6f0d2c/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 12d2832..1af3b18 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 @@ -587,6 +587,12 @@ </task> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update additional LLAP-Tez settings"> + <task xsi:type="configure" id="llap_update_tez_shuffle_ssl_enable"> + <summary>Update tez.runtime.shuffle.ssl.enable property</summary> + </task> + </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update JVM stack size for LLAP"> <task xsi:type="configure" id="llap_append_stack_size_java_opts"> <summary>Updating JVM stack size for LLAP</summary> http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6f0d2c/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml index 35f564e..159b81a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml @@ -757,6 +757,10 @@ </component> <component name="HIVE_SERVER_INTERACTIVE"> + <pre-upgrade> + <task xsi:type="configure" id="llap_update_tez_shuffle_ssl_enable"/> + </pre-upgrade> + <pre-downgrade/> <upgrade> <task xsi:type="restart-task" /> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6f0d2c/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 32822a7..4654e6f 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 @@ -861,6 +861,7 @@ <task xsi:type="configure" id="llap_update_settings"/> <task xsi:type="configure" id="llap_update_tez_settings"/> <task xsi:type="configure" id="hdp_2_6_maint_llap_config"/> + <task xsi:type="configure" id="llap_update_tez_shuffle_ssl_enable"/> </pre-upgrade> <pre-downgrade /> http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6f0d2c/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml index 4764297..83fde06 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml @@ -91,6 +91,14 @@ </definition> </changes> </component> + <component name="HIVE_SERVER_INTERACTIVE"> + <changes> + <definition xsi:type="configure" id="llap_update_tez_shuffle_ssl_enable" summary="Update additional LLAP-Tez settings"> + <type>tez-interactive-site</type> + <set key="tez.runtime.shuffle.ssl.enable" value="false"/> + </definition> + </changes> + </component> </service> <service name="HBASE"> http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6f0d2c/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml index 0d9a746..bee7b98 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml @@ -313,6 +313,12 @@ </task> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update additional LLAP-Tez settings"> + <task xsi:type="configure" id="llap_update_tez_shuffle_ssl_enable"> + <summary>Update tez.runtime.shuffle.ssl.enable property</summary> + </task> + </execute-stage> + <!-- HBASE --> <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for Ranger Hbase plugin"> <task xsi:type="configure" id="hdp_2_6_maint_ranger_hbase_plugin_cluster_name"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/bb6f0d2c/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml index b5c88de..1aabd90 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml @@ -801,6 +801,10 @@ </component> <component name="HIVE_SERVER_INTERACTIVE"> + <pre-upgrade> + <task xsi:type="configure" id="llap_update_tez_shuffle_ssl_enable"/> + </pre-upgrade> + <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> <upgrade> <task xsi:type="restart-task" /> </upgrade>
