hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject 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
Date Fri, 07 Sep 2018 00:25:28 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 62919a379 -> 3f8c15ad2


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>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3f8c15ad
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3f8c15ad
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3f8c15ad

Branch: refs/heads/branch-2
Commit: 3f8c15ad2b7c12d4e602c61cf82d429c9ec49fda
Parents: 62919a3
Author: Michael Stack <stack@apache.org>
Authored: Thu Sep 6 17:24:03 2018 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Thu Sep 6 17:25:20 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/3f8c15ad/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/3f8c15ad/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;


Mime
View raw message