HBASE-25635 CandidateGenerator may miss some region balance actions

Author: sunhelly

hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/CandidateGenerator.java

@@ -26,7 +26,6 @@
 import org.apache.hadoop.hbase.client.RegionInfo;
 
 import org.apache.yetus.audience.InterfaceAudience;
-
 /**
  * Generates a candidate action to be applied to the cluster for cost function search
  */
@@ -124,12 +123,12 @@ protected BaseLoadBalancer.Cluster.Action getAction(int fromServer, int fromRegi
     if (fromServer < 0 || toServer < 0) {
       return BaseLoadBalancer.Cluster.NullAction;
     }
-    if (fromRegion > 0 && toRegion > 0) {
+    if (fromRegion >= 0 && toRegion >= 0) {
       return new BaseLoadBalancer.Cluster.SwapRegionsAction(fromServer, fromRegion,
         toServer, toRegion);
-    } else if (fromRegion > 0) {
+    } else if (fromRegion >= 0) {
       return new BaseLoadBalancer.Cluster.MoveRegionAction(fromRegion, fromServer, toServer);
-    } else if (toRegion > 0) {
+    } else if (toRegion >= 0) {
       return new BaseLoadBalancer.Cluster.MoveRegionAction(toRegion, toServer, fromServer);
     } else {
       return BaseLoadBalancer.Cluster.NullAction;

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

@@ -263,6 +263,10 @@ protected void setCandidateGenerators(List<CandidateGenerator> customCandidateGe
     this.candidateGenerators = customCandidateGenerators;
   }
 
+  public List<CandidateGenerator> getCandidateGenerators() {
+    return this.candidateGenerators;
+  }
+
   @Override
   protected void setSlop(Configuration conf) {
     this.slop = conf.getFloat("hbase.regions.slop", 0.001F);

hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCost.java

@@ -67,6 +67,7 @@ public static void beforeAllTests() throws IOException {
     BalancerTestBase.conf.setBoolean("hbase.master.balancer.stochastic.runMaxSteps", true);
     BalancerTestBase.conf.set(StochasticLoadBalancer.COST_FUNCTIONS_COST_FUNCTIONS_KEY,
       HeterogeneousRegionCountCostFunction.class.getName());
+
     // Need to ensure test dir has been created.
     assertTrue(FileSystem.get(HTU.getConfiguration()).mkdirs(HTU.getDataTestDir()));
     RULES_FILE = HTU.getDataTestDir(
@@ -76,6 +77,7 @@ public static void beforeAllTests() throws IOException {
       RULES_FILE);
     BalancerTestBase.loadBalancer = new StochasticLoadBalancer();
     BalancerTestBase.loadBalancer.setConf(BalancerTestBase.conf);
+    BalancerTestBase.loadBalancer.getCandidateGenerators().add(new FairRandomCandidateGenerator());
   }
 
   @Test
@@ -279,4 +281,26 @@ private ServerAndLoad createServer(final String host) {
     ServerName sn = ServerName.valueOf(host, port, startCode);
     return new ServerAndLoad(sn, 0);
   }
+
+  static class FairRandomCandidateGenerator extends
+    StochasticLoadBalancer.RandomCandidateGenerator {
+
+    @Override
+    public BaseLoadBalancer.Cluster.Action pickRandomRegions(BaseLoadBalancer.Cluster cluster,
+      int thisServer, int otherServer) {
+      if (thisServer < 0 || otherServer < 0) {
+        return BaseLoadBalancer.Cluster.NullAction;
+      }
+
+      int thisRegion = pickRandomRegion(cluster, thisServer, 0.5);
+      int otherRegion = pickRandomRegion(cluster, otherServer, 0.5);
+
+      return getAction(thisServer, thisRegion, otherServer, otherRegion);
+    }
+
+    @Override
+    BaseLoadBalancer.Cluster.Action generate(BaseLoadBalancer.Cluster cluster) {
+      return super.generate(cluster);
+    }
+  }
 }

hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java

@@ -71,7 +71,7 @@
 public class SecureTestUtil {
 
   private static final Logger LOG = LoggerFactory.getLogger(SecureTestUtil.class);
-  private static final int WAIT_TIME = 10000;
+  private static final int WAIT_TIME = 30000;
 
   public static void configureSuperuser(Configuration conf) throws IOException {
     // The secure minicluster creates separate service principals based on the