Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-27506 Optionally disable sorting directories by size in CleanerChore (#4896) 

Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
This commit is contained in:
Peter Somogyi 2022-11-25 15:31:56 +01:00 committed by GitHub
parent 84749b054c
commit 1ddb5bb43c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/CleanerChore.java
View File

@ -70,6 +70,13 @@ public abstract class CleanerChore<T extends FileCleanerDelegate> extends Schedu
*/ */
public static final String LOG_CLEANER_CHORE_SIZE = "hbase.log.cleaner.scan.dir.concurrent.size"; public static final String LOG_CLEANER_CHORE_SIZE = "hbase.log.cleaner.scan.dir.concurrent.size";
static final String DEFAULT_LOG_CLEANER_CHORE_POOL_SIZE = "1"; static final String DEFAULT_LOG_CLEANER_CHORE_POOL_SIZE = "1";
/**
* 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; private final DirScanPool pool;
@ -82,6 +89,7 @@ public abstract class CleanerChore<T extends FileCleanerDelegate> extends Schedu
protected List<String> excludeDirs; protected List<String> excludeDirs;
private CompletableFuture<Boolean> future; private CompletableFuture<Boolean> future;
private boolean forceRun; private boolean forceRun;
private boolean sortDirectories;
public CleanerChore(String name, final int sleepPeriod, final Stoppable s, Configuration conf, public CleanerChore(String name, final int sleepPeriod, final Stoppable s, Configuration conf,
FileSystem fs, Path oldFileDir, String confKey, DirScanPool pool) { FileSystem fs, Path oldFileDir, String confKey, DirScanPool pool) {
@ -123,6 +131,8 @@ public abstract class CleanerChore<T extends FileCleanerDelegate> extends Schedu
if (excludeDirs != null) { if (excludeDirs != null) {
LOG.info("Cleaner {} excludes sub dirs: {}", name, excludeDirs); LOG.info("Cleaner {} excludes sub dirs: {}", name, excludeDirs);
} }
sortDirectories = conf.getBoolean(LOG_CLEANER_CHORE_DIRECTORY_SORTING,
DEFAULT_LOG_CLEANER_CHORE_DIRECTORY_SORTING);
initCleanerChain(confKey); initCleanerChain(confKey);
} }
@ -475,7 +485,9 @@ public abstract class CleanerChore<T extends FileCleanerDelegate> extends Schedu
// Step.3: Start to traverse and delete the sub-directories. // Step.3: Start to traverse and delete the sub-directories.
List<CompletableFuture<Boolean>> futures = new ArrayList<>(); List<CompletableFuture<Boolean>> futures = new ArrayList<>();
if (!subDirs.isEmpty()) { if (!subDirs.isEmpty()) {
sortByConsumedSpace(subDirs); if (sortDirectories) {
sortByConsumedSpace(subDirs);
}
// Submit the request of sub-directory deletion. // Submit the request of sub-directory deletion.
subDirs.forEach(subDir -> { subDirs.forEach(subDir -> {
if (!shouldExclude(subDir)) { if (!shouldExclude(subDir)) {