svn commit: r1344096 - in /hbase/branches/0.92: CHANGES.txt src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java

[st...@apache.org]

Author: stack
Date: Wed May 30 04:42:39 2012
New Revision: 1344096

URL: http://svn.apache.org/viewvc?rev=1344096&view=rev
Log:
HBASE-6133 TestRestartCluster failing in 0.92

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1344096&r1=1344095&r2=1344096&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Wed May 30 04:42:39 2012
@@ -75,6 +75,7 @@ Release 0.92.2 - Unreleased
    HBASE-5986  Clients can see holes in the META table when regions are being split (Enis)
    HBASE-6095  ActiveMasterManager NullPointerException (Jimmy Xiang)
    HBASE-6126  Fix broke TestLocalHBaseCluster in 0.92/0.94
+   HBASE-6133  TestRestartCluster failing in 0.92
 
   IMPROVEMENTS
    HBASE-5592  Make it easier to get a table from shell (Ben West)

Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java?rev=1344096&r1=1344095&r2=1344096&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java Wed May 30 04:42:39 2012
@@ -22,7 +22,6 @@ package org.apache.hadoop.hbase.master;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.io.IOException;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -35,11 +34,11 @@ import org.apache.hadoop.hbase.TableExis
 import org.apache.hadoop.hbase.client.MetaScanner;
 import org.apache.hadoop.hbase.executor.EventHandler.EventType;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.hbase.zookeeper.ZKAssign;
 import org.apache.hadoop.hbase.zookeeper.ZKUtil;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 public class TestRestartCluster {
@@ -92,6 +91,9 @@ public class TestRestartCluster {
   @Test (timeout=300000)
   public void testClusterRestart() throws Exception {
     UTIL.startMiniCluster(3);
+    while (!UTIL.getMiniHBaseCluster().getMaster().isInitialized()) {
+      Threads.sleep(1);
+    }
     LOG.info("\n\nCreating tables");
     for(byte [] TABLE : TABLES) {
       UTIL.createTable(TABLE, FAMILY);