From 526efb48a6d3a44a753ee9fcb6333eba046193ca Mon Sep 17 00:00:00 2001
From: Todd Lipcon <todd@apache.org>
Date: Tue, 10 Jan 2012 03:29:02 +0000
Subject: [PATCH] HDFS-2762. Fix TestCheckpoint timing out on HA branch.
 Contributed by Uma Maheswara Rao G.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229464 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt           | 2 ++
 .../src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
index f57d2d35fdf..165d09578ff 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
@@ -89,3 +89,5 @@ HDFS-2291. Allow the StandbyNode to make checkpoints in an HA setup. (todd)
 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)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 6b800a9637f..da9724ef1f7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -632,7 +632,7 @@ public class MiniDFSCluster {
         
         nnCounterForFormat++;
         if (formatThisOne) {
-          NameNode.format(conf);
+          DFSTestUtil.formatNameNode(conf);
         }
         prevNNDirs = FSNamesystem.getNamespaceDirs(conf);
       }