Index: src/test/java/org/apache/hadoop/hbase/master/TestLoadBalancer.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/master/TestLoadBalancer.java (revision 1091111) +++ src/test/java/org/apache/hadoop/hbase/master/TestLoadBalancer.java (working copy) @@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.HServerInfo; +import org.apache.hadoop.hbase.HServerLoad; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.master.LoadBalancer.RegionPlan; import org.apache.hadoop.hbase.util.Bytes; @@ -141,38 +142,6 @@ new int [] { 12, 100 }, }; - @Test - public void testRandomizer() { - for(int [] mockCluster : clusterStateMocks) { - if (mockCluster.length < 5) continue; - Map> servers = - mockClusterServers(mockCluster); - for (Map.Entry> e: servers.entrySet()) { - List original = e.getValue(); - if (original.size() < 5) continue; - // Try ten times in case random chances upon original order more than - // one or two times in a row. - boolean same = true; - for (int i = 0; i < 10 && same; i++) { - List copy = new ArrayList(original); - System.out.println("Randomizing before " + copy.size()); - for (HRegionInfo hri: copy) { - System.out.println(hri.getEncodedName()); - } - List randomized = LoadBalancer.randomize(copy); - System.out.println("Randomizing after " + randomized.size()); - for (HRegionInfo hri: randomized) { - System.out.println(hri.getEncodedName()); - } - if (original.equals(randomized)) continue; - same = false; - break; - } - assertFalse(same); - } - } - } - /** * Test the load balancing algorithm. * @@ -187,7 +156,7 @@ for(int [] mockCluster : clusterStateMocks) { Map> servers = mockClusterServers(mockCluster); LOG.info("Mock Cluster : " + printMock(servers) + " " + printStats(servers)); - List plans = loadBalancer.balanceCluster(servers); + List plans = loadBalancer.balanceCluster(servers, false); List balancedCluster = reconcile(servers, plans); LOG.info("Mock Balance : " + printMock(balancedCluster)); assertClusterAsBalanced(balancedCluster); Index: pom.xml =================================================================== --- pom.xml (revision 1091111) +++ pom.xml (working copy) @@ -525,7 +525,7 @@ 2.5 1.1.1 2.1 - r06 + r09