HDFS-1419. Federation: Three test cases need minor modification after the new block id change. Contributed by Tanping Wang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-1052@1000989 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -278,6 +278,9 @@ Trunk (unreleased changes)
     HDFS-1357. HFTP traffic served by DataNode shouldn't use service port 
     on NameNode. (Kan Zhang via jghoman)
 
+    HDFS-1419. Federation: Three test cases need minor modification after 
+    the new block id change (Tanping Wang via suresh)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/test/hdfs/org/apache/hadoop/hdfs/TestClientBlockVerification.java

@@ -90,6 +90,7 @@ public class TestClientBlockVerification {
     s.setSoTimeout(HdfsConstants.READ_TIMEOUT);
 
     String file = BlockReader.getFileName(targetAddr,
+        "test-blockpoolid",
         block.getBlockId());
     return BlockReader.newBlockReader(s, file, block,
         testBlock.getBlockToken(), offset, lenToRead, conf.getInt(

src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java

@@ -36,7 +36,6 @@ import org.apache.hadoop.hdfs.BlockReader;
 import org.apache.hadoop.hdfs.DFSTestUtil;
 import org.apache.hadoop.hdfs.HdfsConfiguration;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.protocol.ExtendedBlock;
 import org.apache.hadoop.hdfs.protocol.LocatedBlock;
@@ -248,7 +247,9 @@ public class TestDataNodeVolumeFailure extends TestCase{
     s.connect(targetAddr, HdfsConstants.READ_TIMEOUT);
     s.setSoTimeout(HdfsConstants.READ_TIMEOUT);
 
-    String file = BlockReader.getFileName(targetAddr, block.getBlockId());
+    String file = BlockReader.getFileName(targetAddr, 
+        "test-blockpoolid",
+        block.getBlockId());
     BlockReader blockReader = 
       BlockReader.newBlockReader(s, file, block, lblock
         .getBlockToken(), 0, -1, 4096);

src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockTokenWithDFS.java

@@ -130,7 +130,8 @@ public class TestBlockTokenWithDFS extends TestCase {
       s.connect(targetAddr, HdfsConstants.READ_TIMEOUT);
       s.setSoTimeout(HdfsConstants.READ_TIMEOUT);
 
-      String file = BlockReader.getFileName(targetAddr, block.getBlockId());
+      String file = BlockReader.getFileName(targetAddr, 
+          "test-blockpoolid", block.getBlockId());
       blockReader = BlockReader.newBlockReader(s, file, block, 
           lblock.getBlockToken(), 0, -1, 
           conf.getInt("io.file.buffer.size", 4096));