[hbase] branch branch-2.4 updated: HBASE-27506 Optionally disable sorting directories by size in CleanerChore (#4896)

[ps...@apache.org]

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

psomogyi pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new 0a372921135 HBASE-27506 Optionally disable sorting directories by size in CleanerChore (#4896)
0a372921135 is described below

commit 0a3729211359eeb1e8249d218a098fdf5c8938f3
Author: Peter Somogyi <ps...@apache.org>
AuthorDate: Fri Nov 25 15:31:56 2022 +0100

    HBASE-27506 Optionally disable sorting directories by size in CleanerChore (#4896)
    
    Signed-off-by: Wellington Chevreuil <wc...@apache.org>
    (cherry picked from commit b68dcf46e9eacbce3325f70163756f91b0447658)
---
 .../apache/hadoop/hbase/master/cleaner/CleanerChore.java   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
index f2fa4ac6691..f54c30c6e0e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
@@ -63,6 +63,13 @@ public abstract class CleanerChore<T extends FileCleanerDelegate> extends Schedu
    */
   public static final String CHORE_POOL_SIZE = "hbase.cleaner.scan.dir.concurrent.size";
   static final String DEFAULT_CHORE_POOL_SIZE = "0.25";
+  /**
+   * Enable the CleanerChore to sort the subdirectories by consumed space and start the cleaning
+   * with the largest subdirectory. Enabled by default.
+   */
+  public static final String LOG_CLEANER_CHORE_DIRECTORY_SORTING =
+    "hbase.cleaner.directory.sorting";
+  static final boolean DEFAULT_LOG_CLEANER_CHORE_DIRECTORY_SORTING = true;
 
   private final DirScanPool pool;
 
@@ -72,6 +79,7 @@ public abstract class CleanerChore<T extends FileCleanerDelegate> extends Schedu
   protected final Map<String, Object> params;
   private final AtomicBoolean enabled = new AtomicBoolean(true);
   protected List<T> cleanersChain;
+  private boolean sortDirectories;
 
   public CleanerChore(String name, final int sleepPeriod, final Stoppable s, Configuration conf,
     FileSystem fs, Path oldFileDir, String confKey, DirScanPool pool) {
@@ -99,6 +107,8 @@ public abstract class CleanerChore<T extends FileCleanerDelegate> extends Schedu
     this.oldFileDir = oldFileDir;
     this.conf = conf;
     this.params = params;
+    sortDirectories = conf.getBoolean(LOG_CLEANER_CHORE_DIRECTORY_SORTING,
+      DEFAULT_LOG_CLEANER_CHORE_DIRECTORY_SORTING);
     initCleanerChain(confKey);
   }
 
@@ -406,7 +416,9 @@ public abstract class CleanerChore<T extends FileCleanerDelegate> extends Schedu
       // Step.3: Start to traverse and delete the sub-directories.
       List<CompletableFuture<Boolean>> futures = new ArrayList<>();
       if (!subDirs.isEmpty()) {
-        sortByConsumedSpace(subDirs);
+        if (sortDirectories) {
+          sortByConsumedSpace(subDirs);
+        }
         // Submit the request of sub-directory deletion.
         subDirs.forEach(subDir -> {
           CompletableFuture<Boolean> subFuture = new CompletableFuture<>();