From aab3a8a870b7bbe2d48e2909fd1dad4b20988e00 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 6 Sep 2018 17:24:03 -0700 Subject: [PATCH] HBASE-21155 Save on a few log strings and some churn in wal splitter by skipping out early if no logs in dir; ADDENDUM Address review comments. Signed-off-by: Mike Drob --- .../java/org/apache/hadoop/hbase/master/MasterWalManager.java | 2 +- .../java/org/apache/hadoop/hbase/master/SplitLogManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterWalManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterWalManager.java index f24805f7cc5..d716a116197 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterWalManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterWalManager.java @@ -144,7 +144,7 @@ public class MasterWalManager { } /** - * @return Return listing of ServerNames found in the filesystem under the WAL directory + * @return listing of ServerNames found in the filesystem under the WAL directory * that COULD BE 'alive'; excludes those that have a '-splitting' suffix as these are already * being split -- they cannot be 'alive'. */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java index 1e4e2ce17ed..4d977d34275 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java @@ -174,7 +174,7 @@ public class SplitLogManager { } FileStatus[] logfiles = FSUtils.listStatus(fs, logDir, filter); if (logfiles == null || logfiles.length == 0) { - LOG.info(logDir + " dir is empty, no logs to split."); + LOG.info("{} dir is empty, no logs to split.", logDir); } else { Collections.addAll(fileStatus, logfiles); } @@ -292,7 +292,7 @@ public class SplitLogManager { String msg = "Finished splitting (more than or equal to) " + totalSize + " bytes in " + ((batch == null)? 0: batch.installed) + " log files in " + logDirs + " in " + - ((startTime == -1)? startTime: (EnvironmentEdgeManager.currentTime() - startTime)) + "ms"; + ((startTime == 0)? startTime: (EnvironmentEdgeManager.currentTime() - startTime)) + "ms"; status.markComplete(msg); LOG.info(msg); return totalSize;