svn commit: r1582554 - /hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java

[en...@apache.org]

Author: enis
Date: Thu Mar 27 23:58:10 2014
New Revision: 1582554

URL: http://svn.apache.org/r1582554
Log:
HBASE-10858 TestRegionRebalancing is failing

Modified:
    hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java

Modified: hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java?rev=1582554&r1=1582553&r2=1582554&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java (original)
+++ hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java Thu Mar 27 23:58:10 2014
@@ -33,10 +33,12 @@ import org.apache.hadoop.hbase.catalog.C
 import org.apache.hadoop.hbase.catalog.MetaReader;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
+import org.apache.hadoop.hbase.master.RegionStates;
 import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.JVMClusterUtil;
+import org.apache.hadoop.hbase.util.Threads;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -118,10 +120,10 @@ public class TestRegionRebalancing {
     UTIL.getHBaseCluster().getMaster().balance();
     assertRegionsAreBalanced();
 
-    // On a balanced cluster, calling balance() should return false
-    assert(UTIL.getHBaseCluster().getMaster().balance() == false);
+    // On a balanced cluster, calling balance() should return true
+    assert(UTIL.getHBaseCluster().getMaster().balance() == true);
 
-    // However if we add a server, then the balance() call should return true 
+    // if we add a server, then the balance() call should return true
     // add a region server - total of 3
     LOG.info("Started third server=" +
         UTIL.getHBaseCluster().startRegionServer().getRegionServer().getServerName());
@@ -198,7 +200,7 @@ public class TestRegionRebalancing {
           if (!(serverLoad <= avgLoadPlusSlop && serverLoad >= avgLoadMinusSlop)) {
             LOG.debug(server.getServerName() + " Isn't balanced!!! Avg: " + avg +
                 " actual: " + serverLoad + " slop: " + slop);
-            success = false;            
+            success = false;
             break;
           }
         }
@@ -246,6 +248,10 @@ public class TestRegionRebalancing {
         Thread.sleep(200);
       } catch (InterruptedException e) {}
     }
+    RegionStates regionStates = UTIL.getHBaseCluster().getMaster().getAssignmentManager().getRegionStates();
+    while (!regionStates.getRegionsInTransition().isEmpty()) {
+      Threads.sleep(100);
+    }
   }
 
 }