Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 6348 invoked from network); 30 May 2008 23:54:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 May 2008 23:54:58 -0000 Received: (qmail 54279 invoked by uid 500); 30 May 2008 23:55:00 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 54250 invoked by uid 500); 30 May 2008 23:55:00 -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 54241 invoked by uid 99); 30 May 2008 23:55:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 May 2008 16:55:00 -0700 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; Fri, 30 May 2008 23:54:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AA6A02388A0F; Fri, 30 May 2008 16:54:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r661914 - in /hadoop/core/branches/branch-0.17: CHANGES.txt src/java/org/apache/hadoop/dfs/FSNamesystem.java Date: Fri, 30 May 2008 23:54:37 -0000 To: core-commits@hadoop.apache.org From: hairong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080530235437.AA6A02388A0F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hairong Date: Fri May 30 16:54:37 2008 New Revision: 661914 URL: http://svn.apache.org/viewvc?rev=661914&view=rev Log: Merge -r 661911:661912 from trunk to main to move the change log of HADOOP-2159 into the release 0.17.1 section Modified: hadoop/core/branches/branch-0.17/CHANGES.txt hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java Modified: hadoop/core/branches/branch-0.17/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/CHANGES.txt?rev=661914&r1=661913&r2=661914&view=diff ============================================================================== --- hadoop/core/branches/branch-0.17/CHANGES.txt (original) +++ hadoop/core/branches/branch-0.17/CHANGES.txt Fri May 30 16:54:37 2008 @@ -1,6 +1,13 @@ Hadoop Change Log +Release 0.17.1 + + BUG FIXES + + HADOOP-2159 Namenode stuck in safemode. The counter blockSafe should + not be decremented for invalid blocks. (hairong) + Release 0.17.0 - 2008-05-18 INCOMPATIBLE CHANGES Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java?rev=661914&r1=661913&r2=661914&view=diff ============================================================================== --- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java (original) +++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/dfs/FSNamesystem.java Fri May 30 16:54:37 2008 @@ -3065,7 +3065,6 @@ return; } - decrementSafeBlockCount(block); // // It's possible that the block was removed because of a datanode // failure. If the block is still valid, check if replication is @@ -3074,6 +3073,7 @@ // INode fileINode = blocksMap.getINode(block); if (fileINode != null) { + decrementSafeBlockCount(block); updateNeededReplications(block, -1, 0); }