Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 88844 invoked from network); 4 Mar 2011 05:24:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 05:24:19 -0000 Received: (qmail 48621 invoked by uid 500); 4 Mar 2011 05:24:19 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 48597 invoked by uid 500); 4 Mar 2011 05:24:18 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 48583 invoked by uid 99); 4 Mar 2011 05:24:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 05:24:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 04 Mar 2011 05:24:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 76CD02388C0F; Fri, 4 Mar 2011 05:23:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1077803 - /hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Date: Fri, 04 Mar 2011 05:23:55 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304052355.76CD02388C0F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Fri Mar 4 05:23:55 2011 New Revision: 1077803 URL: http://svn.apache.org/viewvc?rev=1077803&view=rev Log: commit ee0e481fb74310b6ed2d62bb0377970a09abb371 Author: Luke Lu Date: Fri Feb 11 11:36:00 2011 -0800 Fix a task state corrupting race +++ b/YAHOO-CHANGES.txt + Fix a task state corrupting race. (llu) + Modified: hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Modified: hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1077803&r1=1077802&r2=1077803&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original) +++ hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Fri Mar 4 05:23:55 2011 @@ -2419,12 +2419,13 @@ public class TaskTracker implements MRCo ((this.taskStatus.getRunState() == TaskStatus.State.COMMIT_PENDING || this.taskStatus.getRunState() == TaskStatus.State.FAILED_UNCLEAN || this.taskStatus.getRunState() == TaskStatus.State.KILLED_UNCLEAN) && - taskStatus.getRunState() == TaskStatus.State.RUNNING)) { + (taskStatus.getRunState() == TaskStatus.State.RUNNING || + taskStatus.getRunState() == TaskStatus.State.UNASSIGNED))) { //make sure we ignore progress messages after a task has //invoked TaskUmbilicalProtocol.done() or if the task has been //KILLED/FAILED/FAILED_UNCLEAN/KILLED_UNCLEAN //Also ignore progress update if the state change is from - //COMMIT_PENDING/FAILED_UNCLEAN/KILLED_UNCLEA to RUNNING + //COMMIT_PENDING/FAILED_UNCLEAN/KILLED_UNCLEA to RUNNING or UNASSIGNED LOG.info(task.getTaskID() + " Ignoring status-update since " + ((this.done) ? "task is 'done'" : ("runState: " + this.taskStatus.getRunState()))