svn commit: r1229464 - in /hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs: CHANGES.HDFS-1623.txt src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java

[todd]

Author: todd
Date: Tue Jan 10 03:29:02 2012
New Revision: 1229464

URL: http://svn.apache.org/viewvc?rev=1229464&view=rev
Log:
HDFS-2762. Fix TestCheckpoint timing out on HA branch. Contributed by Uma 
Maheswara Rao G.

Modified:
    
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
    
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java

Modified: 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt?rev=1229464&r1=1229463&r2=1229464&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
 (original)
+++ 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
 Tue Jan 10 03:29:02 2012
@@ -89,3 +89,5 @@ HDFS-2291. Allow the StandbyNode to make
 HDFS-2709. Appropriately handle error conditions in EditLogTailer (atm via 
todd)
 
 HDFS-2730. Refactor shared HA-related test code into HATestUtil class (todd)
+
+HDFS-2762. Fix TestCheckpoint timing out on HA branch. (Uma Maheswara Rao G 
via todd)

Modified: 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java?rev=1229464&r1=1229463&r2=1229464&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
 (original)
+++ 
hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
 Tue Jan 10 03:29:02 2012
@@ -632,7 +632,7 @@ public class MiniDFSCluster {
         
         nnCounterForFormat++;
         if (formatThisOne) {
-          NameNode.format(conf);
+          DFSTestUtil.formatNameNode(conf);
         }
         prevNNDirs = FSNamesystem.getNamespaceDirs(conf);
       }