You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/16 17:15:16 UTC

[06/17] ambari git commit: AMBARI-20999. More updates to llap configs for hdp stack (Siddharth Seth via smohanty)

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/822d5457
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/822d5457
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/822d5457

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 822d54577677384f5a31eef90e2a345378fbcaf4
Parents: d0a5cd4
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri May 12 22:15:53 2017 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri May 12 22:30:38 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/822d5457/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 9ac7042..61bd581 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
@@ -499,8 +499,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/822d5457/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>