diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java index 7eff412..808ff8c 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java @@ -455,7 +455,7 @@ public class RegionStates { Map>> result = new HashMap>>(); synchronized (this) { - if (!server.getConfiguration().getBoolean("hbase.master.loadbalance.bytable", true)) { + if (!server.getConfiguration().getBoolean("hbase.master.loadbalance.bytable", false)) { Map> svrToRegions = new HashMap>(serverHoldings.size()); for (Map.Entry> e: serverHoldings.entrySet()) { diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java index 68a0887..4f0b77e 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java @@ -38,7 +38,7 @@ public class LoadBalancerFactory { // Create the balancer Class balancerKlass = - conf.getClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, DefaultLoadBalancer.class, + conf.getClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, StochasticLoadBalancer.class, LoadBalancer.class); return ReflectionUtils.newInstance(balancerKlass, conf);