HBASE-16910 Avoid NPE when starting StochasticLoadBalancer Signed-off-by: Ashish Singhi <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ae502a9d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ae502a9d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ae502a9d Branch: refs/heads/branch-1 Commit: ae502a9d5ce3dc5c4a485c3ff364d433bdf29a10 Parents: 16823ff Author: Guanghao Zhang <[email protected]> Authored: Tue Oct 25 11:58:41 2016 +0530 Committer: Ashish Singhi <[email protected]> Committed: Tue Oct 25 11:58:41 2016 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 2 +- .../hadoop/hbase/master/balancer/StochasticLoadBalancer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ae502a9d/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index e079b3b..ba067e7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -774,8 +774,8 @@ public class HMaster extends HRegionServer implements MasterServices, Server { } //initialize load balancer - this.balancer.setClusterStatus(getClusterStatus()); this.balancer.setMasterServices(this); + this.balancer.setClusterStatus(getClusterStatus()); this.balancer.initialize(); // Check if master is shutting down because of some issue http://git-wip-us.apache.org/repos/asf/hbase/blob/ae502a9d/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java index d497d42..7d7dc8e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java @@ -232,7 +232,7 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { updateMetricsSize(tablesCount * (functionsCount + 1)); // +1 for overall } 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); } }
