瀏覽代碼

Merge -r 543621:543622 from trunk to 0.13 branch. Fixes: HADOOP-1452.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.13@543623 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 年之前
父節點
當前提交
2a5b80e542
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 4 0
      CHANGES.txt
  2. 1 1
      src/java/org/apache/hadoop/mapred/TaskTracker.java

+ 4 - 0
CHANGES.txt

@@ -440,6 +440,10 @@ Branch 0.13 (unreleased changes)
      only while sorting, so that stuck maps are correctly terminated.
      (Devaraj Das and Arun C Murthy via cutting)
 
+132. HADOOP-1452.  Change TaskTracker.MapOutputServlet.doGet.totalRead
+     to a long, permitting map outputs to exceed 2^31 bytes.
+     (omalley via cutting)
+
 
 Release 0.12.3 - 2007-04-06
 

+ 1 - 1
src/java/org/apache/hadoop/mapred/TaskTracker.java

@@ -1930,7 +1930,7 @@ public class TaskTracker
         //seek to the correct offset for the reduce
         mapOutputIn.seek(startOffset);
           
-        int totalRead = 0;
+        long totalRead = 0;
         int len = mapOutputIn.read(buffer, 0,
                                    partLength < MAX_BYTES_TO_READ 
                                    ? (int)partLength : MAX_BYTES_TO_READ);