HBASE-25806 Backport the region location finder initialization fix in H…

…BASE-25802 (#3196) Signed-off-by: Yulin Niu <niuyulin@apache.org>
apache · Apr 26, 2021 · e765e19 · e765e19
1 parent 1dc881a
commit e765e19
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
@@ -103,8 +103,7 @@ public String getRack(ServerName server) {
    * The constructor that uses the basic MetricsBalancer
    */
   protected BaseLoadBalancer() {
-    metricsBalancer = new MetricsBalancer();
-    createRegionFinder();
+    this(null);
   }
 
   /**
@@ -1060,7 +1059,9 @@ public void setConf(Configuration conf) {
     this.onlySystemTablesOnMaster = LoadBalancer.isSystemTablesOnlyOnMaster(this.config);
 
     this.rackManager = new RackManager(getConf());
+    useRegionFinder = config.getBoolean("hbase.master.balancer.uselocality", true);
     if (useRegionFinder) {
+      regionFinder = new RegionLocationFinder();
       regionFinder.setConf(conf);
     }
     this.isByTable = conf.getBoolean(HConstants.HBASE_MASTER_LOADBALANCE_BYTABLE, isByTable);