Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 93511 invoked from network); 27 Sep 2010 18:21:41 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Sep 2010 18:21:41 -0000 Received: (qmail 53197 invoked by uid 500); 27 Sep 2010 18:21:41 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 53173 invoked by uid 500); 27 Sep 2010 18:21:40 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 53165 invoked by uid 99); 27 Sep 2010 18:21:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Sep 2010 18:21:40 +0000 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; Mon, 27 Sep 2010 18:21:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 93AF823889B3; Mon, 27 Sep 2010 18:21:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1001854 - in /hadoop/hdfs/trunk: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestDatanodeDescriptor.java Date: Mon, 27 Sep 2010 18:21:16 -0000 To: hdfs-commits@hadoop.apache.org From: hairong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100927182116.93AF823889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hairong Date: Mon Sep 27 18:21:15 2010 New Revision: 1001854 URL: http://svn.apache.org/viewvc?rev=1001854&view=rev Log: HDFS-1368. Add a block counter to DatanodeDescriptor. Contributed by Hairong Kuang. Modified: hadoop/hdfs/trunk/CHANGES.txt hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestDatanodeDescriptor.java Modified: hadoop/hdfs/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1001854&r1=1001853&r2=1001854&view=diff ============================================================================== --- hadoop/hdfs/trunk/CHANGES.txt (original) +++ hadoop/hdfs/trunk/CHANGES.txt Mon Sep 27 18:21:15 2010 @@ -154,6 +154,8 @@ Trunk (unreleased changes) HDFS-1320. Add LOG.isDebugEnabled() guard for each LOG.debug(..). (Erik Steffl via szetszwo) + HDFS-1368. Add a block counter to DatanodeDescriptor. (hairong) + BUG FIXES HDFS-1039. Adding test for JspHelper.getUGI(jnp via boryas) Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java?rev=1001854&r1=1001853&r2=1001854&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java (original) +++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java Mon Sep 27 18:21:15 2010 @@ -100,6 +100,7 @@ public class DatanodeDescriptor extends } private volatile BlockInfo blockList = null; + private int numBlocks = 0; // isAlive == heartbeats.contains(this) // This is an optimization, because contains takes O(n) time on Arraylist protected boolean isAlive = false; @@ -201,6 +202,7 @@ public class DatanodeDescriptor extends return false; // add to the head of the data-node list blockList = b.listInsert(blockList, this); + numBlocks++; return true; } @@ -210,7 +212,12 @@ public class DatanodeDescriptor extends */ boolean removeBlock(BlockInfo b) { blockList = b.listRemove(blockList, this); - return b.removeNode(this); + if ( b.removeNode(this) ) { + numBlocks--; + return true; + } else { + return false; + } } /** @@ -246,7 +253,7 @@ public class DatanodeDescriptor extends } public int numBlocks() { - return blockList == null ? 0 : blockList.listCount(this); + return numBlocks; } /** Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestDatanodeDescriptor.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestDatanodeDescriptor.java?rev=1001854&r1=1001853&r2=1001854&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestDatanodeDescriptor.java (original) +++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestDatanodeDescriptor.java Mon Sep 27 18:21:15 2010 @@ -48,4 +48,29 @@ public class TestDatanodeDescriptor exte bc = dd.getInvalidateBlocks(MAX_LIMIT); assertEquals(bc.getBlocks().length, REMAINING_BLOCKS); } + + public void testBlocksCounter() throws Exception { + DatanodeDescriptor dd = new DatanodeDescriptor(); + assertEquals(0, dd.numBlocks()); + BlockInfo blk = new BlockInfo(new Block(1L), 1); + BlockInfo blk1 = new BlockInfo(new Block(2L), 2); + // add first block + assertTrue(dd.addBlock(blk)); + assertEquals(1, dd.numBlocks()); + // remove a non-existent block + assertFalse(dd.removeBlock(blk1)); + assertEquals(1, dd.numBlocks()); + // add an existent block + assertFalse(dd.addBlock(blk)); + assertEquals(1, dd.numBlocks()); + // add second block + assertTrue(dd.addBlock(blk1)); + assertEquals(2, dd.numBlocks()); + // remove first block + assertTrue(dd.removeBlock(blk)); + assertEquals(1, dd.numBlocks()); + // remove second block + assertTrue(dd.removeBlock(blk1)); + assertEquals(0, dd.numBlocks()); + } }