svn commit: r656153 - in /hadoop/core/trunk: CHANGES.txt src/test/org/apache/hadoop/dfs/TestDatanodeBlockScanner.java

[dhruba]

Author: dhruba
Date: Wed May 14 01:42:51 2008
New Revision: 656153

URL: http://svn.apache.org/viewvc?rev=656153&view=rev
Log:
HADOOP-3388. Fix for TestDatanodeBlockScanner to handle blocks with
generation stamps in them.  (dhruba)



Modified:
    hadoop/core/trunk/CHANGES.txt
    
hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeBlockScanner.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=656153&r1=656152&r2=656153&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed May 14 01:42:51 2008
@@ -235,6 +235,9 @@
     HADOOP-3365. Removes an unnecessary copy of the key from SegmentDescriptor
     to MergeQueue. (Devaraj Das)
 
+    HADOOP-3388. Fix for TestDatanodeBlockScanner to handle blocks with
+    generation stamps in them.  (dhruba)
+
 Release 0.17.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeBlockScanner.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeBlockScanner.java?rev=656153&r1=656152&r2=656153&view=diff
==============================================================================
--- 
hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeBlockScanner.java 
(original)
+++ 
hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestDatanodeBlockScanner.java 
Wed May 14 01:42:51 2008
@@ -174,7 +174,7 @@
     fs = cluster.getFileSystem();
     Path file1 = new Path("/tmp/testBlockVerification/file1");
     DFSTestUtil.createFile(fs, file1, 1024, (short)3, 0);
-    String block = DFSTestUtil.getFirstBlock(fs, file1).toString();
+    String block = DFSTestUtil.getFirstBlock(fs, file1).getBlockName();
     
     dfsClient = new DFSClient(new InetSocketAddress("localhost", 
                                         cluster.getNameNodePort()), conf);