Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 91257 invoked from network); 4 Mar 2011 03:29:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 03:29:00 -0000 Received: (qmail 10325 invoked by uid 500); 4 Mar 2011 03:28:59 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 10287 invoked by uid 500); 4 Mar 2011 03:28:59 -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 10278 invoked by uid 99); 4 Mar 2011 03:28:59 -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 03:28:59 +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 03:28:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B43AD2388C16; Fri, 4 Mar 2011 03:28:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076991 - /hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Date: Fri, 04 Mar 2011 03:28:36 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304032836.B43AD2388C16@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Fri Mar 4 03:28:36 2011 New Revision: 1076991 URL: http://svn.apache.org/viewvc?rev=1076991&view=rev Log: commit 5eae526ef1d52d613bfe1b0ae630cd5b0353eea3 Author: Jitendra Nath Pandey Date: Mon Aug 31 10:23:19 2009 -0700 HADOOP-5780: Fix slightly confusing log from "-metaSave" on NameNode. From patch https://issues.apache.org/jira/secure/attachment/12417831/HADOOP-5780.hadoop-0.20.patch Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1076991&r1=1076990&r2=1076991&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Mar 4 03:28:36 2011 @@ -523,17 +523,27 @@ public class FSNamesystem implements FSC int usableReplicas = numReplicas.liveReplicas() + numReplicas.decommissionedReplicas(); // l: == live:, d: == decommissioned c: == corrupt e: == excess - out.print(block + " (replicas:" + + out.print(block + ((usableReplicas > 0)? "" : " MISSING") + + " (replicas:" + " l: " + numReplicas.liveReplicas() + " d: " + numReplicas.decommissionedReplicas() + " c: " + numReplicas.corruptReplicas() + - " e: " + numReplicas.excessReplicas() + - ((usableReplicas > 0)? "" : " MISSING") + ")"); + " e: " + numReplicas.excessReplicas() + ") "); + + Collection corruptNodes = + corruptReplicas.getNodes(block); for (Iterator jt = blocksMap.nodeIterator(block); jt.hasNext();) { DatanodeDescriptor node = jt.next(); - out.print(" " + node + " : "); + String state = ""; + if (corruptNodes != null && corruptNodes.contains(node)) { + state = "(corrupt)"; + } else if (node.isDecommissioned() || + node.isDecommissionInProgress()) { + state = "(decommissioned)"; + } + out.print(" " + node + state + " : "); } out.println(""); }