You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/09/12 21:00:08 UTC

[2/3] hbase git commit: HBASE-21190 Log files and count of entries in each as we load from the MasterProcWAL store

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

Conflicts:
	hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java


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

Branch: refs/heads/branch-1.4
Commit: 1d2f6f80d67dc060549b4a8c4146f4c580190e29
Parents: 403a883
Author: Michael Stack <st...@apache.org>
Authored: Wed Sep 12 10:13:43 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Sep 12 13:36:45 2018 -0700

----------------------------------------------------------------------
 .../hbase/procedure2/store/wal/ProcedureWALFormatReader.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/1d2f6f80/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 281292d..b8dbc25 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
@@ -113,6 +113,7 @@ public class ProcedureWALFormatReader {
   }
 
   public void read(ProcedureWALFile log, ProcedureWALFormat.Loader loader) throws IOException {
+    long count = 0;
     FSDataInputStream stream = log.getStream();
     try {
       boolean hasMore = true;
@@ -123,6 +124,7 @@ public class ProcedureWALFormatReader {
           hasMore = false;
           break;
         }
+        count++;
         switch (entry.getType()) {
           case PROCEDURE_WAL_INIT:
             readInitEntry(entry);
@@ -144,8 +146,9 @@ public class ProcedureWALFormatReader {
             throw new CorruptedWALProcedureStoreException("Invalid entry: " + entry);
         }
       }
+      LOG.info("Read " + count + " entries in " + log);
     } catch (InvalidProtocolBufferException e) {
-      LOG.error("got an exception while reading the procedure WAL: " + log, e);
+      LOG.error("While reading entry #" + count + " in " + log, e);
       loader.markCorruptedWAL(log, e);
     }