diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java index 5d5dddb..f681d64 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java @@ -21,7 +21,6 @@ import static org.apache.hadoop.hbase.HConstants.HBASE_MASTER_LOGCLEANER_PLUGINS import java.io.IOException; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; @@ -79,10 +78,8 @@ public class LogCleaner extends CleanerChore { int newSize = conf.getInt(OLD_WALS_CLEANER_SIZE, OLD_WALS_CLEANER_DEFAULT_SIZE); if (newSize == oldWALsCleaner.size()) { - if (LOG.isDebugEnabled()) { - LOG.debug("Size from configuration is the same as previous which is " + - newSize + ", no need to update."); - } + LOG.debug("Size from configuration is the same as previous which is {}, " + + "no need to update", newSize); return; } interruptOldWALsCleaner(); @@ -91,7 +88,7 @@ public class LogCleaner extends CleanerChore { @Override protected int deleteFiles(Iterable filesToDelete) { - List results = new LinkedList<>(); + List results = new ArrayList<>(); for (FileStatus toDelete : filesToDelete) { CleanerContext context = CleanerContext.createCleanerContext(toDelete); if (context != null) { @@ -119,7 +116,7 @@ public class LogCleaner extends CleanerChore { } private List createOldWalsCleaner(int size) { - LOG.info("Creating OldWALs cleaners with size: " + size); + LOG.info("Creating OldWALs cleaners with size: {}", size); List oldWALsCleaner = new ArrayList<>(size); for (int i = 0; i < size; i++) { @@ -152,14 +149,11 @@ public class LogCleaner extends CleanerChore { } } catch (InterruptedException ite) { // It's most likely from configuration changing request - if (context != null) { - LOG.warn("Interrupted while cleaning oldWALs " + - context.getTargetToClean() + ", try to clean it next round."); - } + LOG.warn("Interrupted while cleaning oldWALs. Try to clean it next round."); interrupted = true; } catch (IOException e) { // fs.delete() fails. - LOG.warn("Failed to clean oldwals with exception: " + e); + LOG.warn("Failed to clean oldwals with exception", e); succeed = false; } finally { if (context != null) { @@ -172,9 +166,7 @@ public class LogCleaner extends CleanerChore { } } } - if (LOG.isDebugEnabled()) { - LOG.debug("Exiting cleaner."); - } + LOG.debug("Exiting cleaner."); } private static final class CleanerContext { @@ -207,12 +199,12 @@ public class LogCleaner extends CleanerChore { wait(waitIfNotFinished); totalTime += waitIfNotFinished; if (totalTime >= MAX_WAIT) { - LOG.warn("Spend too much time to delete oldwals " + target); + LOG.warn("Spend too much time to delete oldwals {}", target); return result; } } } catch (InterruptedException e) { - LOG.warn("Interrupted while waiting deletion of " + target); + LOG.warn("Interrupted while waiting deletion of {}", target); return result; } return result;