Merge -r 728675:728676 from trunk onto 0.19 branch. Fixes HADOOP-4924.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.19@729867 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1,5 +1,7 @@
 Hadoop Change Log
 
+    HADOOP-4924. Fixes a race condition in TaskTracker re-init. (ddas)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

src/mapred/org/apache/hadoop/mapred/TaskTracker.java

@@ -814,21 +814,7 @@ public class TaskTracker
     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
@@ -854,6 +840,11 @@ public class TaskTracker
       } catch (InterruptedException e) {
       }
     }
+    
+    if (taskReportServer != null) {
+      taskReportServer.stop();
+      taskReportServer = null;
+    }
   }
 
   /**