You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2007/04/02 21:44:25 UTC

svn commit: r524903 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/mapred/MapTask.java

Author: cutting
Date: Mon Apr  2 12:44:24 2007
New Revision: 524903

URL: http://svn.apache.org/viewvc?view=rev&rev=524903
Log:
HADOOP-1191.  Fix map tasks to wait until sort progress thread has stopped before reporting the task done.  Contributed by Devaraj.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=524903&r1=524902&r2=524903
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Mon Apr  2 12:44:24 2007
@@ -102,6 +102,9 @@
  4. HADOOP-1175.  Fix bugs in JSP for displaying a task's log messages.
     (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
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java?view=diff&rev=524903&r1=524902&r2=524903
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java Mon Apr  2 12:44:24 2007
@@ -188,6 +188,9 @@
       in.close();                               // close input
       collector.close();
       sortProgress.interrupt();
+      try {
+        sortProgress.join();
+      } catch (InterruptedException ie){ }
     }
     done(umbilical);
   }