Repository: hbase
Updated Branches:
  refs/heads/branch-2.1 d81e80671 -> 487f713c6


HBASE-21190 Log files and count of entries in each as we load from the 
MasterProcWAL store


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

Branch: refs/heads/branch-2.1
Commit: 487f713c632e1a8afed7cae5d2ccaf770386bc1c
Parents: d81e806
Author: Michael Stack <[email protected]>
Authored: Wed Sep 12 10:13:43 2018 -0700
Committer: Michael Stack <[email protected]>
Committed: Wed Sep 12 10:19:46 2018 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java   | 1 -
 .../hbase/procedure2/store/wal/ProcedureWALFormatReader.java    | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/487f713c/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
----------------------------------------------------------------------
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
index da8af84..ac3a529 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java
@@ -83,7 +83,6 @@ public final class ProcedureWALFormat {
       // Ignore the last log which is current active log.
       while (logs.hasNext()) {
         ProcedureWALFile log = logs.next();
-        LOG.debug("Loading WAL id={}", log.getLogId());
         log.open();
         try {
           reader.read(log);

http://git-wip-us.apache.org/repos/asf/hbase/blob/487f713c/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
----------------------------------------------------------------------
diff --git 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
index d1deb18..4ab70f1 100644
--- 
a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
+++ 
b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java
@@ -140,6 +140,7 @@ public class ProcedureWALFormatReader {
       LOG.info("Rebuilding tracker for " + log);
     }
 
+    long count = 0;
     FSDataInputStream stream = log.getStream();
     try {
       boolean hasMore = true;
@@ -149,6 +150,7 @@ public class ProcedureWALFormatReader {
           LOG.warn("Nothing left to decode. Exiting with missing EOF, log=" + 
log);
           break;
         }
+        count++;
         switch (entry.getType()) {
           case PROCEDURE_WAL_INIT:
             readInitEntry(entry);
@@ -170,8 +172,9 @@ public class ProcedureWALFormatReader {
             throw new CorruptedWALProcedureStoreException("Invalid entry: " + 
entry);
         }
       }
+      LOG.info("Read {} entries in {}", count, log);
     } catch (InvalidProtocolBufferException e) {
-      LOG.error("While reading procedure from " + log, e);
+      LOG.error("While reading entry #{} in {}", count, log, e);
       loader.markCorruptedWAL(log, e);
     }
 

Reply via email to