Repository: ambari Updated Branches: refs/heads/branch-2.5 71399b7f7 -> 8be765f1d
AMBARI-20782. Add config changes from AMBARI-20537 to hive component upgrade path. (Swapan Shridhar via Prasanth Jayachandran). Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8be765f1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8be765f1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8be765f1 Branch: refs/heads/branch-2.5 Commit: 8be765f1d08b8b28c5170a11a97ea7da4ec67671 Parents: 71399b7 Author: Swapan Shridhar <sshrid...@hortonworks.com> Authored: Tue Apr 18 17:58:27 2017 -0700 Committer: Swapan Shridhar <sshrid...@hortonworks.com> Committed: Tue Apr 18 17:58:35 2017 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 10 ++++++ .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 37 +++++++++++++------- .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 2 ++ 3 files changed, 36 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8be765f1/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 1762d15..99107ef 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 @@ -481,6 +481,16 @@ <transfer operation="delete" delete-key="atlas.cluster.name"/> </definition> + <definition xsi:type="configure" id="llap_append_stack_size_java_opts" summary="Update JVM stack size for LLAP"> + <type>hive-interactive-env</type> + <insert key="llap_java_opts" value="-Xss512k" insert-type="append" newline-before="false" newline-after="false" /> + </definition> + + <definition xsi:type="configure" id="llap_update_shuffle_parallel_copies" summary="Update tez shuffle parallel copies for LLAP"> + <type>hive-interactive-site</type> + <set key="tez.runtime.shuffle.parallel.copies" value="8"/> + </definition> + </changes> </component> http://git-wip-us.apache.org/repos/asf/ambari/blob/8be765f1/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 f1b26d6..e347a02 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 @@ -536,6 +536,30 @@ <task xsi:type="configure" id="hdp_2_6_0_0_tez_append_heap_dump_options_for_tez_am"/> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update headroom for LLAP"> + <task xsi:type="configure" id="llap_update_headroom"> + <summary>Updating headroom for LLAP</summary> + </task> + </execute-stage> + + <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update Hash Aggregation settings for LLAP"> + <task xsi:type="configure" id="llap_update_hashaggregation"> + <summary>Updating Hash Aggregation settings for LLAP</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> + </task> + </execute-stage> + + <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update tez shuffle parallel copies for LLAP"> + <task xsi:type="configure" id="llap_update_shuffle_parallel_copies"> + <summary>Updating tez shuffle parallel copies for LLAP</summary> + </task> + </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER" title="Copying hive.tez.container.size to HIVE SERVER INTERACTIVE's hive-site"> <task xsi:type="configure" id="hdp_2_6_0_0_copy_hive_tez_container_size_to_hiveInteractive"/> </execute-stage> @@ -692,19 +716,6 @@ <function>wait_for_safemode_off</function> </task> </execute-stage> - - <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update headroom for LLAP"> - <task xsi:type="configure" id="llap_update_headroom"> - <summary>Updating the Hive Log4J2 properties to include parameterizations</summary> - </task> - </execute-stage> - - <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Update Hash Aggregation settings for LLAP"> - <task xsi:type="configure" id="llap_update_hashaggregation"> - <summary>Updating Hash Aggregation settings for LLAP</summary> - </task> - </execute-stage> - </group> <group xsi:type="restart" name="KAFKA" title="Kafka"> http://git-wip-us.apache.org/repos/asf/ambari/blob/8be765f1/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 53d4579..94aab48 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 @@ -842,6 +842,8 @@ <task xsi:type="configure" id="llap_cli_log4j2_parameterize"/> <task xsi:type="configure" id="llap_update_headroom"/> <task xsi:type="configure" id="llap_update_hashaggregation"/> + <task xsi:type="configure" id="llap_append_stack_size_java_opts"/> + <task xsi:type="configure" id="llap_update_shuffle_parallel_copies"/> </pre-upgrade> <pre-downgrade />