瀏覽代碼

HADOOP-1191. Fix map tasks to wait until sort progress thread has stopped before reporting the task done. Contributed by Devaraj.

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

+ 3 - 0
CHANGES.txt

@@ -102,6 +102,9 @@ Release 0.12.3 (not yet released)
  4. HADOOP-1175.  Fix bugs in JSP for displaying a task's log messages.
  4. HADOOP-1175.  Fix bugs in JSP for displaying a task's log messages.
     (Arun C Murthy via cutting)
     (Arun C Murthy via cutting)
 
 
+ 5. HADOOP-1191.  Fix map tasks to wait until sort progress thread has
+    stopped before reporting the task done.  (Devaraj Das via cutting)
+
 
 
 Release 0.12.2 - 2007-23-17
 Release 0.12.2 - 2007-23-17
 
 

+ 3 - 0
src/java/org/apache/hadoop/mapred/MapTask.java

@@ -188,6 +188,9 @@ class MapTask extends Task {
       in.close();                               // close input
       in.close();                               // close input
       collector.close();
       collector.close();
       sortProgress.interrupt();
       sortProgress.interrupt();
+      try {
+        sortProgress.join();
+      } catch (InterruptedException ie){ }
     }
     }
     done(umbilical);
     done(umbilical);
   }
   }