svn commit: r537932 - in /lucene/hadoop/branches/branch-0.13: CHANGES.txt src/java/org/apache/hadoop/mapred/TaskTracker.java

[cutting]

Author: cutting
Date: Mon May 14 11:20:44 2007
New Revision: 537932

URL: http://svn.apache.org/viewvc?view=rev&rev=537932
Log:
Merge -r 537927:537928 from trunk.  Fixes: HADOOP-1350.

Modified:
    lucene/hadoop/branches/branch-0.13/CHANGES.txt
    
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java

Modified: lucene/hadoop/branches/branch-0.13/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/CHANGES.txt?view=diff&rev=537932&r1=537931&r2=537932
==============================================================================
--- lucene/hadoop/branches/branch-0.13/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.13/CHANGES.txt Mon May 14 11:20:44 2007
@@ -372,6 +372,9 @@
 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
 

Modified: 
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java?view=diff&rev=537932&r1=537931&r2=537932
==============================================================================
--- 
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java
 (original)
+++ 
lucene/hadoop/branches/branch-0.13/src/java/org/apache/hadoop/mapred/TaskTracker.java
 Mon May 14 11:20:44 2007
@@ -1920,9 +1920,6 @@
         //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 @@
         while (len > 0) {
           try {
             outStream.write(buffer, 0, len);
+            outStream.flush();
           } catch (IOException ie) {
             isInputException = false;
             throw ie;