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/

[cos]

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