Merging changes from trunk to HDFS-1052 branch

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

CHANGES.txt

@@ -296,6 +296,8 @@ Trunk (unreleased changes)
     HDFS-96. HDFS supports blocks larger than 2 GB.
     (Patrick Kling via dhruba)
 
+    HDFS-1433. Fix test failures - TestPread and TestFileLimit. (suresh)
+
     HDFS-1364. Makes long running HFTP-based applications do relogins
     if necessary. (Jitendra Pandey via ddas)
 
@@ -1233,6 +1235,8 @@ Trunk (unreleased changes)
 
     HDFS-1413. Fix broken links to HDFS Wiki. (shv)
 
+    HDFS-1420. Clover build doesn't generate per-test coverage (cos)
+
 Release 0.20.3 - Unreleased
 
   IMPROVEMENTS

build.xml

@@ -1305,7 +1305,8 @@
    <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
    <mkdir dir="${clover.db.dir}"/>
    <clover-setup initString="${clover.db.dir}/hadoop_coverage.db">
-     <fileset dir="src" includes="java/**/*"/>
+     <fileset dir="${src.dir}" includes="java/**/*"/>
+     <testsources dir="${test.src.dir}" />
    </clover-setup>
    <echo message="HDFS-783: test-libhdfs is disabled for Clover'ed builds" />
 </target>

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

@@ -66,7 +66,7 @@ public class SimulatedFSDataset  implements FSConstants, FSDatasetInterface, Con
                                     "dfs.datanode.simulateddatastorage";
   public static final String CONFIG_PROPERTY_CAPACITY =
                             "dfs.datanode.simulateddatastorage.capacity";
-//  
+  
   public static final long DEFAULT_CAPACITY = 2L<<40; // 1 terabyte
   public static final byte DEFAULT_DATABYTE = 9; // 1 terabyte
   byte simulatedDataByte = DEFAULT_DATABYTE;
@@ -303,6 +303,9 @@ public class SimulatedFSDataset  implements FSConstants, FSDatasetInterface, Con
     setConf(conf);
   }
   
+  private SimulatedFSDataset() { // real construction when setConf called.. Uggg
+  }
+  
   public Configuration getConf() {
     return conf;
   }