Revert "HBASE-26242 Allow split when store file count larger than the configed blocking file count (#3652)"

This reverts commit 2fa4bb0.

Author: sunhelly

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java

@@ -200,9 +200,7 @@ public String dumpQueue() {
   }
 
   public synchronized boolean requestSplit(final Region r) {
-    // Don't split regions that are blocking is the default behavior.
-    // But in some circumstances, split here is needed to prevent the region size from
-    // continuously growing, as well as the number of store files, see HBASE-26242.
+    // don't split regions that are blocking
     HRegion hr = (HRegion)r;
     try {
       if (shouldSplitRegion() && hr.getCompactPriority() >= PRIORITY_USER) {
@@ -220,14 +218,14 @@ public synchronized boolean requestSplit(final Region r) {
     return false;
   }
 
-  private synchronized void requestSplit(final Region r, byte[] midKey) {
+  public synchronized void requestSplit(final Region r, byte[] midKey) {
     requestSplit(r, midKey, null);
   }
 
   /*
    * The User parameter allows the split thread to assume the correct user identity
    */
-  private synchronized void requestSplit(final Region r, byte[] midKey, User user) {
+  public synchronized void requestSplit(final Region r, byte[] midKey, User user) {
     if (midKey == null) {
       LOG.debug("Region " + r.getRegionInfo().getRegionNameAsString() +
         " not splittable because midkey=null");
@@ -489,9 +487,9 @@ public int getSplitQueueSize() {
   }
 
   private boolean shouldSplitRegion() {
-    if (server.getNumberOfOnlineRegions() > 0.9 * regionSplitLimit) {
+    if(server.getNumberOfOnlineRegions() > 0.9*regionSplitLimit) {
       LOG.warn("Total number of regions is approaching the upper limit " + regionSplitLimit + ". "
-        + "Please consider taking a look at http://hbase.apache.org/book.html#ops.regionmgt");
+          + "Please consider taking a look at http://hbase.apache.org/book.html#ops.regionmgt");
     }
     return (regionSplitLimit > server.getNumberOfOnlineRegions());
   }
@@ -659,14 +657,11 @@ private void doCompaction(User user) {
               this + "; duration=" + StringUtils.formatTimeDiff(now, start));
         if (completed) {
           // degenerate case: blocked regions require recursive enqueues
-          if (region.getCompactPriority() < Store.PRIORITY_USER
-            && store.getCompactPriority() <= 0) {
+          if (store.getCompactPriority() <= 0) {
             requestSystemCompaction(region, store, "Recursive enqueue");
           } else {
             // see if the compaction has caused us to exceed max region size
-            if (!requestSplit(region) && store.getCompactPriority() <= 0) {
-              requestSystemCompaction(region, store, "Recursive enqueue");
-            }
+            requestSplit(region);
           }
         }
       } catch (IOException ex) {

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

@@ -267,10 +267,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
   public static final String COMPACTION_AFTER_BULKLOAD_ENABLE =
       "hbase.compaction.after.bulkload.enable";
 
-  /** Config for allow split when file count greater than the configured blocking file count*/
-  public static final String SPLIT_IGNORE_BLOCKING_ENABLED_KEY =
-      "hbase.hregion.split.ignore.blocking.enabled";
-
   /**
    * This is for for using HRegion as a local storage, where we may put the recovered edits in a
    * special place. Once this is set, we will only replay the recovered edits under this directory
@@ -8200,10 +8196,6 @@ public Optional<byte[]> checkSplit(boolean force) {
    * @return The priority that this region should have in the compaction queue
    */
   public int getCompactPriority() {
-    if (checkSplit().isPresent() && conf.getBoolean(SPLIT_IGNORE_BLOCKING_ENABLED_KEY, false)) {
-      // if a region should split, split it before compact
-      return Store.PRIORITY_USER;
-    }
     return stores.values().stream().mapToInt(HStore::getCompactPriority).min()
         .orElse(Store.NO_PRIORITY);
   }