Repository: hbase Updated Branches: refs/heads/branch-2 ad6ca7c95 -> 20a9b8ad0
HBASE-21055 NullPointerException when balanceOverall() but server balance info is null Signed-off-by: huzheng <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/20a9b8ad Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/20a9b8ad Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/20a9b8ad Branch: refs/heads/branch-2 Commit: 20a9b8ad00269e0a2ff8690799b26d5903510d55 Parents: ad6ca7c Author: haxiaolin <[email protected]> Authored: Wed Aug 15 11:15:46 2018 +0800 Committer: huzheng <[email protected]> Committed: Thu Oct 18 14:06:08 2018 +0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/20a9b8ad/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 b0d3f19..89de13b 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 @@ -479,6 +479,9 @@ public class SimpleLoadBalancer extends BaseLoadBalancer { for (int i = 0; i < serverLoadList.size(); i++) { ServerAndLoad serverload = serverLoadList.get(i); BalanceInfo balanceInfo = serverBalanceInfo.get(serverload.getServerName()); + if (balanceInfo == null) { + continue; + } setLoad(serverLoadList, i, balanceInfo.getNumRegionsAdded()); if (balanceInfo.getHriList().size() + balanceInfo.getNumRegionsAdded() == max) { RegionInfo hriToPlan;
