From 487f713c632e1a8afed7cae5d2ccaf770386bc1c Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Wed, 12 Sep 2018 10:13:43 -0700 Subject: [PATCH] HBASE-21190 Log files and count of entries in each as we load from the MasterProcWAL store --- .../apache/hadoop/hbase/procedure2/store/wal/ProcedureWALFormat.java | 1 - .../hadoop/hbase/procedure2/store/wal/ProcedureWALFormatReader.java | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 da8af84259..ac3a52941e 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); 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 d1deb1816e..4ab70f18e1 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); } -- 2.16.3