From 061fda6ae1e68af5f53a62a9ff8b29139c999dbc Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Thu, 20 Sep 2012 23:22:20 +0000
Subject: [PATCH] HBASE-6849 Make StochasticLoadBalancer the default

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1388267 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/hadoop/hbase/master/RegionStates.java  | 2 +-
 .../hadoop/hbase/master/balancer/LoadBalancerFactory.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
index 7eff4129cd2..808ff8c6d87 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
@@ -455,7 +455,7 @@ public class RegionStates {
     Map<String, Map<ServerName, List<HRegionInfo>>> result =
       new HashMap<String, Map<ServerName,List<HRegionInfo>>>();
     synchronized (this) {
-      if (!server.getConfiguration().getBoolean("hbase.master.loadbalance.bytable", true)) {
+      if (!server.getConfiguration().getBoolean("hbase.master.loadbalance.bytable", false)) {
         Map<ServerName, List<HRegionInfo>> svrToRegions =
           new HashMap<ServerName, List<HRegionInfo>>(serverHoldings.size());
         for (Map.Entry<ServerName, Set<HRegionInfo>> e: serverHoldings.entrySet()) {
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java
index 68a0887ff83..4f0b77eba83 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java
@@ -38,7 +38,7 @@ public class LoadBalancerFactory {
 
     // Create the balancer
     Class<? extends LoadBalancer> 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);