Merge -r 537927:537928 from trunk. Fixes: HADOOP-1350.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.13@537932 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -372,6 +372,9 @@ Branch 0.13 (unreleased changes)
 110. HADOOP-1341.  Fix intermittent failures in HBase unit tests
      caused by deadlock.  (Jim Kellerman via cutting)
 
+111. HADOOP-1350.  Fix shuffle performance problem caused by forcing
+     chunked encoding of map outputs.  (Devaraj Das via cutting)
+
 
 Release 0.12.3 - 2007-04-06
 

src/java/org/apache/hadoop/mapred/TaskTracker.java

@@ -1920,9 +1920,6 @@ public class TaskTracker
         //the actual number of bytes being transferred
         response.setHeader(MAP_OUTPUT_LENGTH, Long.toString(partLength));
 
-        //use 'chunked' transfer-encoding for transferring data
-        response.setHeader("Transfer-Encoding", "chunked"); 
-
         //use the same buffersize as used for reading the data from disk
         response.setBufferSize(MAX_BYTES_TO_READ);
         
@@ -1942,6 +1939,7 @@ public class TaskTracker
         while (len > 0) {
           try {
             outStream.write(buffer, 0, len);
+            outStream.flush();
           } catch (IOException ie) {
             isInputException = false;
             throw ie;