Repository: hbase Updated Branches: refs/heads/branch-1.3 98b5d2cd4 -> 446a21fed
HBASE-17059 backport HBASE-17039 (SimpleLoadBalancer schedules large amount of invalid region moves) to 1.3.1 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/446a21fe Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/446a21fe Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/446a21fe Branch: refs/heads/branch-1.3 Commit: 446a21fedd1282c15939eb4c46d13c859beedd7a Parents: 98b5d2c Author: Yu Li <l...@apache.org> Authored: Tue Mar 21 14:25:58 2017 +0800 Committer: Yu Li <l...@apache.org> Committed: Tue Mar 21 14:27:05 2017 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/master/balancer/SimpleLoadBalancer.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/446a21fe/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java index 4325585..a354e40 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java @@ -273,14 +273,10 @@ public class SimpleLoadBalancer extends BaseLoadBalancer { serversByLoad.entrySet()) { if (maxToTake == 0) break; // no more to take int load = server.getKey().getLoad(); - if (load >= min && load > 0) { + if (load >= min) { continue; // look for other servers which haven't reached min } int regionsToPut = min - load; - if (regionsToPut == 0) - { - regionsToPut = 1; - } maxToTake -= regionsToPut; underloadedServers.put(server.getKey().getServerName(), regionsToPut); }
