Repository: hbase Updated Branches: refs/heads/branch-2.0 24ed13916 -> 32a396fd1
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/32a396fd Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/32a396fd Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/32a396fd Branch: refs/heads/branch-2.0 Commit: 32a396fd146cfa7b3f3b18fe4269df6e4947abba Parents: 24ed139 Author: haxiaolin <[email protected]> Authored: Wed Aug 15 11:15:46 2018 +0800 Committer: huzheng <[email protected]> Committed: Thu Oct 18 14:07: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/32a396fd/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;
