Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 61233 invoked from network); 7 Nov 2008 01:59:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Nov 2008 01:59:50 -0000 Received: (qmail 38253 invoked by uid 500); 7 Nov 2008 01:59:57 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 38223 invoked by uid 500); 7 Nov 2008 01:59:57 -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 38214 invoked by uid 99); 7 Nov 2008 01:59:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2008 17:59:56 -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; Fri, 07 Nov 2008 01:58:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BF9FE238898E; Thu, 6 Nov 2008 17:59:29 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r712039 - in /hadoop/core/branches/branch-0.18: CHANGES.txt src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java Date: Fri, 07 Nov 2008 01:59:29 -0000 To: core-commits@hadoop.apache.org From: shv@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081107015929.BF9FE238898E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: shv Date: Thu Nov 6 17:59:28 2008 New Revision: 712039 URL: http://svn.apache.org/viewvc?rev=712039&view=rev Log: HADOOP-4597. Merge -r 712032:712032 from trunk to branch 0.18. Modified: hadoop/core/branches/branch-0.18/CHANGES.txt hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java Modified: hadoop/core/branches/branch-0.18/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=712039&r1=712038&r2=712039&view=diff ============================================================================== --- hadoop/core/branches/branch-0.18/CHANGES.txt (original) +++ hadoop/core/branches/branch-0.18/CHANGES.txt Thu Nov 6 17:59:28 2008 @@ -5,6 +5,8 @@ BUG FIXES HADOOP-4499. DFSClient should invoke checksumOk only once. (Raghu Angadi) + HADOOP-4597. Calculate mis-replicated blocks when safe-mode is turned + off manually. (shv) Release 0.18.2 - 2008-11-03 Modified: hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java?rev=712039&r1=712038&r2=712039&view=diff ============================================================================== --- hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java (original) +++ hadoop/core/branches/branch-0.18/src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java Thu Nov 6 17:59:28 2008 @@ -4024,7 +4024,7 @@ checkSuperuserPrivilege(); switch(action) { case SAFEMODE_LEAVE: // leave safe mode - leaveSafeMode(false, false); + leaveSafeMode(false, true); break; case SAFEMODE_ENTER: // enter safe mode enterSafeMode();