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

ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml

@@ -495,6 +495,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">

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>