Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 48098 invoked from network); 10 Aug 2007 18:28:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Aug 2007 18:28:41 -0000 Received: (qmail 80425 invoked by uid 500); 10 Aug 2007 18:28:40 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 80313 invoked by uid 500); 10 Aug 2007 18:28:39 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 80299 invoked by uid 99); 10 Aug 2007 18:28:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2007 11:28:39 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2007 18:28:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 10B631A981A; Fri, 10 Aug 2007 11:28:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r564710 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/dfs/BlockCrcUpgrade.java src/java/org/apache/hadoop/dfs/FSNamesystem.java Date: Fri, 10 Aug 2007 18:28:12 -0000 To: hadoop-commits@lucene.apache.org From: dhruba@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070810182813.10B631A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dhruba Date: Fri Aug 10 11:28:12 2007 New Revision: 564710 URL: http://svn.apache.org/viewvc?view=rev&rev=564710 Log: HADOOP-1680. Improvements to Block CRC upgrade messages. (Raghu Angadi via dhruba) Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/BlockCrcUpgrade.java lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=564710&r1=564709&r2=564710 ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Fri Aug 10 11:28:12 2007 @@ -500,7 +500,10 @@ 146. HADOOP-1666. FsShell object can be used for multiple fs commands. (Dhruba Borthakur via dhruba) -146. HADOOP-1654. Remove performance regression introduced by Block CRC. +147. HADOOP-1654. Remove performance regression introduced by Block CRC. + (Raghu Angadi via dhruba) + +148. HADOOP-1680. Improvements to Block CRC upgrade messages. (Raghu Angadi via dhruba) Release 0.13.0 - 2007-06-08 Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/BlockCrcUpgrade.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/BlockCrcUpgrade.java?view=diff&rev=564710&r1=564709&r2=564710 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/BlockCrcUpgrade.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/BlockCrcUpgrade.java Fri Aug 10 11:28:12 2007 @@ -135,7 +135,7 @@ /** Returns string that has block id and the associated file */ public String toString() { - return block + " (file: " + + return block + " (filename: " + ( (crcInfo == null || crcInfo.fileName == null) ? "Unknown" : crcInfo.fileName ) + ")"; } @@ -650,8 +650,9 @@ info.numMatches++; if (info.numMatches >= (replication/2 + replication%2)) { - LOG.info("readCrcBuf: " + info.numMatches + - " out of " + replication + " matched for " + blockInfo); + LOG.info("At least " + info.numMatches + + " of the " + replication + + " replicated CRC files agree for " + blockInfo); return buf; } @@ -670,9 +671,11 @@ * absolute majority. * Try to pick the buffer that that has max number of matches. */ + int replicasFetched = 0; CrcBufInfo selectedBuf = null; for (int i=0; i 0) ? spacing + unfinishedDnMap.size() + " out of " + dnMap.size() + " nodes are not done." : ""); - LOG.info("Upgrade " + (isUpgradeDone() ? - "completed. " : "still running. ") + spacing + msg); + LOG.info("Block CRC Upgrade is " + (isUpgradeDone() ? + "complete. " : "still running. ") + spacing + msg); return msg; } @@ -1849,8 +1852,8 @@ inactivityExtension) || forceDnCompletion ; if ( datanodesDone ) { - LOG.info(((forceDnCompletion) ? "Forcing " : "Marking ") + - "Datanode Upgrade done"); + LOG.info("Upgrade of DataNode blocks is complete. " + + ((forceDnCompletion) ? "(ForceDnCompletion is on.)" : "")); upgradeStatus = UpgradeStatus.DATANODES_DONE; } } @@ -2082,9 +2085,9 @@ * if fname exists in the directory. */ while (true) { - LOG.info("Deleting \".crc\" files. This can take few minutes ... "); + LOG.info("Deleting \".crc\" files. This may take a few minutes ... "); int numFilesDeleted = deleteCrcFiles("/"); - LOG.info("Deleted " + numFilesDeleted + " files"); + LOG.info("Deleted " + numFilesDeleted + " \".crc\" files"); break; // Should we iterate again? No need for now! } Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java?view=diff&rev=564710&r1=564709&r2=564710 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/FSNamesystem.java Fri Aug 10 11:28:12 2007 @@ -3286,7 +3286,8 @@ String getTurnOffTip() { return (isManual() ? getDistributedUpgradeState() ? "Safe mode will be turned off automatically upon completion of " + - "the distributed upgrade: status = " + getDistributedUpgradeStatus() + "%" : + "the distributed upgrade: upgrade progress = " + + getDistributedUpgradeStatus() + "%" : "Use \"hadoop dfs -safemode leave\" to turn safe mode off." : "Safe mode will be turned off automatically."); }