Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 56139 invoked from network); 22 Dec 2008 13:13:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Dec 2008 13:13:00 -0000 Received: (qmail 67277 invoked by uid 500); 22 Dec 2008 13:12:59 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 67255 invoked by uid 500); 22 Dec 2008 13:12:59 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 67246 invoked by uid 99); 22 Dec 2008 13:12:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Dec 2008 05:12:59 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Dec 2008 13:12:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DC1F52388892; Mon, 22 Dec 2008 05:12:36 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: core-commits@hadoop.apache.org From: ddas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081222131236.DC1F52388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; + } } /**