Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 47382 invoked from network); 24 Oct 2009 00:33:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Oct 2009 00:33:38 -0000 Received: (qmail 13887 invoked by uid 500); 24 Oct 2009 00:33:38 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 13848 invoked by uid 500); 24 Oct 2009 00:33:38 -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 13838 invoked by uid 99); 24 Oct 2009 00:33:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Oct 2009 00:33:38 +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; Sat, 24 Oct 2009 00:33:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 29496238889D; Sat, 24 Oct 2009 00:33:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r829290 - in /hadoop/hdfs/branches/branch-0.21: ./ src/test/hdfs/org/apache/hadoop/hdfs/ src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/ src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/ src/test/hdfs/org/apache/hadoop/test/ Date: Sat, 24 Oct 2009 00:33:15 -0000 To: hdfs-commits@hadoop.apache.org From: cos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091024003315.29496238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cos Date: Sat Oct 24 00:33:14 2009 New Revision: 829290 URL: http://svn.apache.org/viewvc?rev=829290&view=rev Log: HDFS-616. svn merge -c 829253 from trunk to branch.0.21 Added: hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java - copied unchanged from r829253, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/test/GenericTestUtils.java - copied unchanged from r829253, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/test/GenericTestUtils.java Removed: hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/TestBlockReport.java Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=829290&r1=829289&r2=829290&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original) +++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Sat Oct 24 00:33:14 2009 @@ -280,6 +280,8 @@ HDFS-719. Add 6 fault injection tests for pipeline close to simulate slow datanodes and disk errors. (szetszwo) + HDFS-616. Create functional tests for new design of the block report. (cos) + BUG FIXES HDFS-76. Better error message to users when commands fail because of Modified: hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java?rev=829290&r1=829289&r2=829290&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java (original) +++ hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java Sat Oct 24 00:33:14 2009 @@ -40,4 +40,12 @@ return namenode.getNamesystem().getBlockLocations( src, offset, length, false); } + + /** + * Refresh block queue counts on the name-node. + * @param namenode to proxy the invocation to + */ + public static void refreshBlockCounts(NameNode namenode) { + namenode.getNamesystem().blockManager.updateState(); + } } \ No newline at end of file