Author: cos
Date: Fri Nov 13 19:27:28 2009
New Revision: 835960

URL: http://svn.apache.org/viewvc?rev=835960&view=rev
Log:
HDFS-733. svn merge -c 835958 from trunk to branch 0.21

Modified:
    
hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java

Modified: 
hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java?rev=835960&r1=835959&r2=835960&view=diff
==============================================================================
--- 
hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java
 (original)
+++ 
hadoop/hdfs/branches/branch-0.21/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java
 Fri Nov 13 19:27:28 2009
@@ -373,14 +373,14 @@
     final int bytesChkSum = 1024 * 1000;
 
     conf.setInt(DFSConfigKeys.DFS_BYTES_PER_CHECKSUM_KEY, bytesChkSum);
-    conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 3 * bytesChkSum);
+    conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 6 * bytesChkSum);
     shutDownCluster();
     startUpCluster();
 
     try {
       ArrayList<Block> blocks =
-        writeFile(METHOD_NAME, 6 * bytesChkSum, filePath);
-      Block bl = findBlock(filePath, 6 * bytesChkSum);
+        writeFile(METHOD_NAME, 12 * bytesChkSum, filePath);
+      Block bl = findBlock(filePath, 12 * bytesChkSum);
       BlockChecker bc = new BlockChecker(filePath);
       bc.start();
 
@@ -412,16 +412,16 @@
     final int bytesChkSum = 1024 * 1000;
 
     conf.setInt(DFSConfigKeys.DFS_BYTES_PER_CHECKSUM_KEY, bytesChkSum);
-    conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 3 * bytesChkSum);
+    conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 6 * bytesChkSum);
     shutDownCluster();
     startUpCluster();
     // write file and start second node to be "older" than the original
 
     try {
       ArrayList<Block> blocks =
-        writeFile(METHOD_NAME, 6 * bytesChkSum, filePath);
+        writeFile(METHOD_NAME, 12 * bytesChkSum, filePath);
 
-      Block bl = findBlock(filePath, 6 * bytesChkSum);
+      Block bl = findBlock(filePath, 12 * bytesChkSum);
       BlockChecker bc = new BlockChecker(filePath);
       bc.start();
       corruptBlockGS(bl);


Reply via email to