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

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 <mdrob@apache.org>
This commit is contained in:
Michael Stack 2018-09-06 17:24:03 -07:00
parent 3ac3249423
commit aab3a8a870
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterWalManager.java
View File

@ -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 * that COULD BE 'alive'; excludes those that have a '-splitting' suffix as these are already
* being split -- they cannot be 'alive'. * being split -- they cannot be 'alive'.
*/ */

4
hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
View File

@ -174,7 +174,7 @@ public class SplitLogManager {
} }
FileStatus[] logfiles = FSUtils.listStatus(fs, logDir, filter); FileStatus[] logfiles = FSUtils.listStatus(fs, logDir, filter);
if (logfiles == null || logfiles.length == 0) { 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 { } else {
Collections.addAll(fileStatus, logfiles); Collections.addAll(fileStatus, logfiles);
} }
@ -292,7 +292,7 @@ public class SplitLogManager {
String msg = "Finished splitting (more than or equal to) " + totalSize + String msg = "Finished splitting (more than or equal to) " + totalSize +
" bytes in " + ((batch == null)? 0: batch.installed) + " bytes in " + ((batch == null)? 0: batch.installed) +
" log files in " + logDirs + " in " + " log files in " + logDirs + " in " +
((startTime == -1)? startTime: (EnvironmentEdgeManager.currentTime() - startTime)) + "ms"; ((startTime == 0)? startTime: (EnvironmentEdgeManager.currentTime() - startTime)) + "ms";
status.markComplete(msg); status.markComplete(msg);
LOG.info(msg); LOG.info(msg);
return totalSize; return totalSize;