You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by op...@apache.org on 2018/10/18 06:05:32 UTC
hbase git commit: HBASE-21055 NullPointerException when
balanceOverall() but server balance info is null
Repository: hbase
Updated Branches:
refs/heads/master e52039920 -> 92fdc8dd5
HBASE-21055 NullPointerException when balanceOverall() but server balance info is null
Signed-off-by: huzheng <op...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/92fdc8dd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/92fdc8dd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/92fdc8dd
Branch: refs/heads/master
Commit: 92fdc8dd51156d1b21424f227fa19105a50b425b
Parents: e520399
Author: haxiaolin <li...@gmail.com>
Authored: Wed Aug 15 11:15:46 2018 +0800
Committer: huzheng <op...@gmail.com>
Committed: Thu Oct 18 14:04:28 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/92fdc8dd/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;