svn commit: r1428633 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt src/test/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java

[suresh]

Author: suresh
Date: Thu Jan  3 22:06:51 2013
New Revision: 1428633

URL: http://svn.apache.org/viewvc?rev=1428633&view=rev
Log:
HDFS-4355. Merging change r1428631 from branch-1

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1428633&r1=1428632&r2=1428633&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Thu Jan  3 
22:06:51 2013
@@ -318,3 +318,6 @@ Branch-hadoop-1-win (branched from branc
 
     MAPREDUCE-4909. TestKeyValueTextInputFormat fails with Open JDK 7 on
     Windows. (Arpit Agarwal via suresh)
+
+    HDFS-4355. TestNameNodeMetrics.testCorruptBlock fails with open JDK7.
+    (Brandon Li via suresh)

Modified: 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java?rev=1428633&r1=1428632&r2=1428633&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
 (original)
+++ 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
 Thu Jan  3 22:06:51 2013
@@ -103,7 +103,7 @@ public class TestNameNodeMetrics extends
 
   /** Test metrics associated with addition of a file */
   public void testFileAdd() throws Exception {
-    // Add files with 100 blocks
+    // Add files with 32 blocks
     final Path file = getTestPath("testFileAdd");
     createFile(file, 3200, (short)3);
     final long blockCount = 32;
@@ -148,6 +148,7 @@ public class TestNameNodeMetrics extends
   
   /** Corrupt a block and ensure metrics reflects it */
   public void testCorruptBlock() throws Exception {
+    fs.delete(new Path("/"), true);
     // Create a file with single block with two replicas
     final Path file = getTestPath("testCorruptBlock");
     createFile(file, 100, (short)2);