[hbase] 01/01: Revert "HBASE-24151 The master server aborted for IllegalThreadStateException (#1466)"

[vj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to branch revert-1466-branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 8784658cf687fcf751819943cedb890ba5710ef2
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Thu Apr 16 15:48:03 2020 +0530

    Revert "HBASE-24151 The master server aborted for IllegalThreadStateException (#1466)"
    
    This reverts commit 80f1072df8d22c5da00ba374f088210174cb20f4.
---
 .../org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java
index 08c6a0f..463b410 100644
--- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java
+++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java
@@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.constraint.ConstraintException;
 import org.apache.hadoop.hbase.master.LoadBalancer;
 import org.apache.hadoop.hbase.master.MasterServices;
 import org.apache.hadoop.hbase.master.RegionPlan;
-import org.apache.hadoop.hbase.master.balancer.LoadBalancerFactory;
 import org.apache.hadoop.hbase.master.balancer.StochasticLoadBalancer;
 import org.apache.hadoop.hbase.net.Address;
 import org.apache.hadoop.util.ReflectionUtils;
@@ -360,10 +359,6 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer {
     // Create the balancer
     Class<? extends LoadBalancer> balancerKlass = config.getClass(HBASE_RSGROUP_LOADBALANCER_CLASS,
         StochasticLoadBalancer.class, LoadBalancer.class);
-    if (balancerKlass.equals(this.getClass())) {
-      LOG.warn("The internal balancer of RSGroupBasedLoadBalancer cannot be itself, falling back to the default LoadBalancer class");
-      balancerKlass = LoadBalancerFactory.getDefaultLoadBalancerClass();
-    }
     internalBalancer = ReflectionUtils.newInstance(balancerKlass, config);
     internalBalancer.setMasterServices(masterServices);
     internalBalancer.setClusterMetrics(clusterStatus);