svn commit: r721761 - in /hadoop/core/trunk: CHANGES.txt src/mapred/org/apache/hadoop/mapred/ReduceTask.java

[cd...@apache.org]

Author: cdouglas
Date: Sat Nov 29 21:37:12 2008
New Revision: 721761

URL: http://svn.apache.org/viewvc?rev=721761&view=rev
Log:
HADOOP-4732. Pass connection and read timeouts in the correct order when
setting up fetch in reduce. Contributed by Amareshwari Sriramadasu.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=721761&r1=721760&r2=721761&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Sat Nov 29 21:37:12 2008
@@ -230,6 +230,9 @@
     HADOOP-4669. Use correct operator when evaluating whether access time is
     enabled (Dhruba Borthakur via cdouglas)
 
+    HADOOP-4732. Pass connection and read timeouts in the correct order when
+    setting up fetch in reduce. (Amareshwari Sriramadasu via cdouglas)
+
 Release 0.19.1 - Unreleased
 
   BUG FIXES

Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java?rev=721761&r1=721760&r2=721761&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/ReduceTask.java Sat Nov 29 21:37:12 2008
@@ -1222,8 +1222,8 @@
         // Connect
         URLConnection connection = 
           mapOutputLoc.getOutputLocation().openConnection();
-        InputStream input = getInputStream(connection, DEFAULT_READ_TIMEOUT, 
-                                           STALLED_COPY_TIMEOUT);
+        InputStream input = getInputStream(connection, STALLED_COPY_TIMEOUT,
+                                           DEFAULT_READ_TIMEOUT); 
 
         //We will put a file in memory if it meets certain criteria:
         //1. The size of the (decompressed) file should be less than 25% of 
@@ -1319,8 +1319,8 @@
           // Reconnect
           try {
             connection = mapOutputLoc.getOutputLocation().openConnection();
-            input = getInputStream(connection, DEFAULT_READ_TIMEOUT, 
-                STALLED_COPY_TIMEOUT);
+            input = getInputStream(connection, STALLED_COPY_TIMEOUT, 
+                                   DEFAULT_READ_TIMEOUT);
           } catch (IOException ioe) {
             LOG.info("Failed reopen connection to fetch map-output from " + 
                      mapOutputLoc.getHost());