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

[suresh]

Author: suresh
Date: Fri Jan  4 03:34:28 2013
New Revision: 1428713

URL: http://svn.apache.org/viewvc?rev=1428713&view=rev
Log:
HDFS-4358. Merge r1428711 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/TestCheckpoint.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=1428713&r1=1428712&r2=1428713&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 Fri Jan  4 
03:34:28 2013
@@ -321,3 +321,5 @@ Branch-hadoop-1-win (branched from branc
 
     HDFS-4355. TestNameNodeMetrics.testCorruptBlock fails with open JDK7.
     (Brandon Li via suresh)
+
+    HDFS-4358. TestCheckpoint failure with JDK7. (Arpit Agarwal via suresh)

Modified: 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java?rev=1428713&r1=1428712&r2=1428713&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
 (original)
+++ 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
 Fri Jan  4 03:34:28 2013
@@ -722,6 +722,8 @@ public class TestCheckpoint extends Test
   public void testMultipleSecondaryNameNodes() throws IOException {
     MiniDFSCluster cluster = null;
     FileSystem fs = null;
+    SecondaryNameNode snn1 = null;
+
     try {
       Configuration conf = new Configuration();
       cluster = new MiniDFSCluster(conf, 0, true, null);
@@ -734,7 +736,7 @@ public class TestCheckpoint extends Test
       assertTrue(fs.mkdirs(testPath1));
       
       // Start up a 2NN and do a checkpoint.
-      SecondaryNameNode snn1 = startSecondaryNameNode(conf);
+      snn1 = startSecondaryNameNode(conf);
       snn1.doCheckpoint();
       
       assertTrue(testPath1 + " should still exist after good checkpoint",
@@ -780,6 +782,7 @@ public class TestCheckpoint extends Test
       assertTrue(testPath2 + " should exist after bad checkpoint, after 
restart",
           fs.exists(testPath2));
     } finally {
+      if(snn1 != null) snn1.shutdown();
       if(fs != null) fs.close();
       if(cluster!= null) cluster.shutdown();
     }