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 dd...@apache.org on 2008/12/22 14:10:55 UTC
svn commit: r728676 - in /hadoop/core/trunk: CHANGES.txt
src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Author: ddas
Date: Mon Dec 22 05:10:55 2008
New Revision: 728676
URL: http://svn.apache.org/viewvc?rev=728676&view=rev
Log:
HADOOP-4924. Fixes a race condition in TaskTracker re-init. Contributed by Devaraj Das.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=728676&r1=728675&r2=728676&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Dec 22 05:10:55 2008
@@ -501,6 +501,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/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=728676&r1=728675&r2=728676&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Mon Dec 22 05:10:55 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;
+ }
}
/**