You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/09/07 00:25:07 UTC
hbase git commit: HBASE-21155 Save on a few log strings and some
churn in wal splitter by skipping out early if no logs in dir; ADDENDUM
Repository: hbase
Updated Branches:
refs/heads/branch-2.1 205783419 -> 5324911cd
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 <md...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5324911c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5324911c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5324911c
Branch: refs/heads/branch-2.1
Commit: 5324911cd8e58d1a88869040cbada0dfb829ffd6
Parents: 2057834
Author: Michael Stack <st...@apache.org>
Authored: Thu Sep 6 17:24:03 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Thu Sep 6 17:24:03 2018 -0700
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5324911c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterWalManager.java
----------------------------------------------------------------------
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 f24805f..d716a11 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'.
*/
http://git-wip-us.apache.org/repos/asf/hbase/blob/5324911c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
----------------------------------------------------------------------
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 1e4e2ce..4d977d3 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;