Repository: ambari Updated Branches: refs/heads/branch-2.5 a8e1a0d63 -> e75fa1c58
AMBARI-20999. More updates to llap configs for hdp stack (Siddharth Seth via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e75fa1c5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e75fa1c5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e75fa1c5 Branch: refs/heads/branch-2.5 Commit: e75fa1c58ab4ea0f2bda7bd3efe1322d616e3da8 Parents: a8e1a0d Author: Sumit Mohanty <[email protected]> Authored: Fri May 12 22:15:53 2017 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri May 12 22:15:53 2017 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 4 +++- .../HIVE/configuration/tez-interactive-site.xml | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e75fa1c5/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 aadf6eb..35f92a7 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 @@ -492,8 +492,10 @@ <definition xsi:type="configure" id="llap_update_tez_settings" summary="Update additional LLAP-Tez settings"> <type>tez-interactive-site</type> <set key="tez.runtime.shuffle.keep-alive.enabled" value="true"/> - <set key="tez.am.am-rm.heartbeat.interval-ms.max" value="30000"/> + <set key="tez.am.am-rm.heartbeat.interval-ms.max" value="10000"/> <set key="tez.session.am.dag.submit.timeout.secs" value="1209600"/> + <set key="tez.runtime.enable.final-merge.in.output" value="false"/> + <set key="tez.am.task.reschedule.higher.priority" value="false"/> </definition> <definition xsi:type="configure" id="hdp_2_6_0_0_copy_hive_tez_container_size_to_hiveInteractive"> http://git-wip-us.apache.org/repos/asf/ambari/blob/e75fa1c5/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml index 09416e3..6752d65 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/tez-interactive-site.xml @@ -114,5 +114,17 @@ <description>The heartbeat interval between the tez AM and YARN RM</description> <on-ambari-upgrade add="false"/> </property> + <property> + <name>tez.runtime.enable.final-merge.in.output</name> + <value>false</value> + <description>Whether to enable a map side merge of outputs</description> + <on-ambari-upgrade add="false"/> + </property> + <property> + <name>tez.am.task.reschedule.higher.priority</name> + <value>false</value> + <description>Whether rescheduled tasks should be treated at higher priority</description> + <on-ambari-upgrade add="false"/> + </property> </configuration>
