hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhr...@apache.org
Subject svn commit: r632954 - in /hadoop/core/trunk: CHANGES.txt src/test/org/apache/hadoop/dfs/MiniDFSCluster.java src/test/org/apache/hadoop/dfs/TestFsck.java
Date Mon, 03 Mar 2008 06:55:06 GMT
Author: dhruba
Date: Sun Mar  2 22:55:06 2008
New Revision: 632954

URL: http://svn.apache.org/viewvc?rev=632954&view=rev
Log:
HADOOP-2912. MiniDFSCluster restart should wait for namenode to exit
safemode. This was causing TestFsck to fail.  (Mahadev Konar via dhruba)


Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java
    hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=632954&r1=632953&r2=632954&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Sun Mar  2 22:55:06 2008
@@ -110,6 +110,9 @@
     HADOOP-2845.  Fix dfsadmin disk utilization report on Solaris.
     (Martin Traverso via tomwhite)
 
+    HADOOP-2912. MiniDFSCluster restart should wait for namenode to exit
+    safemode. This was causing TestFsck to fail.  (Mahadev Konar via dhruba)
+
 Release 0.16.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java?rev=632954&r1=632953&r2=632954&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/dfs/MiniDFSCluster.java Sun Mar  2 22:55:06
2008
@@ -265,7 +265,14 @@
     
     // Start the DataNodes
     startDataNodes(conf, numDataNodes, manageDfsDirs, operation, racks, hosts, simulatedCapacities);
-    
+    waitClusterUp();
+  }
+
+  /**
+   * wait for the cluster to get out of 
+   * safemode.
+   */
+  public void waitClusterUp() {
     if (numDataNodes > 0) {
       while (!isClusterUp()) {
         try {
@@ -276,7 +283,7 @@
       }
     }
   }
-  
+
   /**
    * Modify the config and start up additional DataNodes.  The info port for
    * DataNodes is guaranteed to use a free port.

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java?rev=632954&r1=632953&r2=632954&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/dfs/TestFsck.java Sun Mar  2 22:55:06 2008
@@ -71,6 +71,7 @@
       // bring up data nodes & cleanup cluster
       cluster.startDataNodes(conf, 4, true, null, null);
       cluster.waitActive();
+      cluster.waitClusterUp();
       fs = cluster.getFileSystem();
       util.cleanup(fs, "/srcdat");
     } finally {



Mime
View raw message