hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r728677 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Date Mon, 22 Dec 2008 13:12:36 GMT
Author: ddas
Date: Mon Dec 22 05:12:36 2008
New Revision: 728677

URL: http://svn.apache.org/viewvc?rev=728677&view=rev
Log:
Merge -r 728675:728676 from trunk onto 0.20 branch. Fixes HADOOP-4924.

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

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=728677&r1=728676&r2=728677&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Mon Dec 22 05:12:36 2008
@@ -486,6 +486,8 @@
     HADOOP-4880. Removes an unnecessary testcase from TestJobTrackerRestart.
     (Amar Kamat via ddas)
 
+    HADOOP-4924. Fixes a race condition in TaskTracker re-init. (ddas)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=728677&r1=728676&r2=728677&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
(original)
+++ hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Mon Dec 22 05:12:36 2008
@@ -871,21 +871,7 @@
     for (TaskInProgress tip : tasksToClose.values()) {
       tip.jobHasFinished(false);
     }
-
-    // Shutdown local RPC servers.  Do them
-    // in parallel, as RPC servers can take a long
-    // time to shutdown.  (They need to wait a full
-    // RPC timeout, which might be 10-30 seconds.)
-    new Thread("RPC shutdown") {
-      @Override
-      public void run() {
-        if (taskReportServer != null) {
-          taskReportServer.stop();
-          taskReportServer = null;
-        }
-      }
-    }.start();
-
+    
     this.running = false;
         
     // Clear local storage
@@ -911,6 +897,11 @@
       } catch (InterruptedException e) {
       }
     }
+    
+    if (taskReportServer != null) {
+      taskReportServer.stop();
+      taskReportServer = null;
+    }
   }
 
   /**



Mime
View raw message