Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-16910 Avoid NPE when starting StochasticLoadBalancer (Guanghao Zhang)

This commit is contained in:
tedyu 2016-10-21 10:25:42 -07:00
parent 0ae211eb39
commit e223639671
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java
View File

@ -391,8 +391,8 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc
HBASE_GROUP_LOADBALANCER_CLASS, HBASE_GROUP_LOADBALANCER_CLASS,
StochasticLoadBalancer.class, LoadBalancer.class); StochasticLoadBalancer.class, LoadBalancer.class);
internalBalancer = ReflectionUtils.newInstance(balancerKlass, config); internalBalancer = ReflectionUtils.newInstance(balancerKlass, config);
internalBalancer.setClusterStatus(clusterStatus);
internalBalancer.setMasterServices(masterServices); internalBalancer.setMasterServices(masterServices);
internalBalancer.setClusterStatus(clusterStatus);
internalBalancer.setConf(config); internalBalancer.setConf(config);
internalBalancer.initialize(); internalBalancer.initialize();
} }

2
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -742,8 +742,8 @@ public class HMaster extends HRegionServer implements MasterServices {
} }
//initialize load balancer //initialize load balancer
this.balancer.setClusterStatus(getClusterStatus());
this.balancer.setMasterServices(this); this.balancer.setMasterServices(this);
this.balancer.setClusterStatus(getClusterStatus());
this.balancer.initialize(); this.balancer.initialize();
// Check if master is shutting down because of some issue // Check if master is shutting down because of some issue

2
hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
View File

@ -233,7 +233,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer {
updateMetricsSize(tablesCount * (functionsCount + 1)); // +1 for overall updateMetricsSize(tablesCount * (functionsCount + 1)); // +1 for overall
} catch (Exception e) { } catch (Exception e) {
LOG.error("failed to get the size of all tables, exception = " + e.getMessage()); LOG.error("failed to get the size of all tables", e);
} }
} }