You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2017/05/20 07:57:45 UTC

ambari git commit: AMBARI-21080. Update shuffle timeout settings for hdp stack. (sseth via Swapan Shridhar).

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 4c2883a0b -> b958ffa39


AMBARI-21080. Update shuffle timeout settings for hdp stack. (sseth via Swapan Shridhar).


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b958ffa3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b958ffa3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b958ffa3

Branch: refs/heads/branch-2.5
Commit: b958ffa3995a797133c134504eb9e9e0dc4e613e
Parents: 4c2883a
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Sat May 20 00:57:29 2017 -0700
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Sat May 20 00:57:29 2017 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml          |  2 ++
 .../HIVE/configuration/tez-interactive-site.xml         | 12 ++++++++++++
 2 files changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b958ffa3/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 35f92a7..483a194 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
@@ -496,6 +496,8 @@
             <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"/>
+            <set key="tez.runtime.shuffle.connect.timeout" value ="30000"/>
+            <set key="tez.runtime.shuffle.read.timeout" value="30000"/>
           </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/b958ffa3/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 6752d65..2c9b272 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
@@ -126,5 +126,17 @@
     <description>Whether rescheduled tasks should be treated at higher priority</description>
     <on-ambari-upgrade add="false"/>
   </property>
+  <property>
+    <name>tez.runtime.shuffle.connect.timeout</name>
+    <value>30000</value>
+    <description>Shuffle connect timeouts (ms)</description>
+    <on-ambari-upgrade add="false"/>
+  </property>
+  <property>
+    <name>tez.runtime.shuffle.read.timeout</name>
+    <value>30000</value>
+    <description>Shuffle read timeout (ms)</description>
+    <on-ambari-upgrade add="false"/>
+  </property>
 
 </configuration>