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

[om...@apache.org]

Author: omalley
Date: Tue Jun  5 22:45:01 2007
New Revision: 544735

URL: http://svn.apache.org/viewvc?view=rev&rev=544735
Log:
HADOOP-1461 Add synchronization to TaskTracker to avoid deadlocks in job
cleanup.

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

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=544735&r1=544734&r2=544735
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Jun  5 22:45:01 2007
@@ -75,6 +75,8 @@
  24. HADOOP-1429.  Stop logging exceptions during normal IPC server
      shutdown.  (stack via cutting)
 
+ 25. HADOOP-1461.  Fix the synchronization of the task tracker to
+     avoid lockups in job cleanup.  (Arun C Murthy via omalley)
 
 Release 0.13.0 - 2007-06-08
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java?view=diff&rev=544735&r1=544734&r2=544735
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java Tue Jun  5 22:45:01 2007
@@ -922,7 +922,7 @@
    * @param action The action with the job
    * @throws IOException
    */
-  private void purgeJob(KillJobAction action) throws IOException {
+  private synchronized void purgeJob(KillJobAction action) throws IOException {
     String jobId = action.getJobId();
     LOG.info("Received 'KillJobAction' for job: " + jobId);
     RunningJob rjob = null;