From 91f79a72d2f6563610c4b3ba700101a56dc511ec Mon Sep 17 00:00:00 2001 From: khemani Date: Thu, 27 Oct 2011 12:23:59 -0700 Subject: [PATCH] HBASE-4687 regionserver may miss zk-heartbeats to master when replaying edits at region open --- .../apache/hadoop/hbase/regionserver/HRegion.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 5243b58..a0f34ca 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -2308,7 +2308,8 @@ public class HRegion implements HeapSize { // , Writable{ private long replayRecoveredEdits(final Path edits, final long minSeqId, final CancelableProgressable reporter) throws IOException { - String msg = "Replaying edits from " + edits + "; minSequenceid=" + minSeqId; + String msg = "Replaying edits from " + edits + "; minSequenceid=" + + minSeqId + "; path=" + edits; LOG.info(msg); MonitoredTask status = TaskMonitor.get().createStatus(msg); @@ -2322,6 +2323,7 @@ public class HRegion implements HeapSize { // , Writable{ long intervalEdits = 0; HLog.Entry entry; Store store = null; + boolean reported_once = false; try { // How many edits seen before we check elapsed time @@ -2354,6 +2356,7 @@ public class HRegion implements HeapSize { // , Writable{ status.abort(msg); throw new IOException(msg); } + reported_once = true; lastReport = cur; } } @@ -2433,14 +2436,14 @@ public class HRegion implements HeapSize { // , Writable{ throw ioe; } } - + if (reporter != null && !reported_once) { + reporter.progress(); + } msg = "Applied " + editsCount + ", skipped " + skippedEdits + ", firstSequenceidInLog=" + firstSeqIdInLog + - ", maxSequenceidInLog=" + currentEditSeqId; + ", maxSequenceidInLog=" + currentEditSeqId + ", path=" + edits; status.markComplete(msg); - if (LOG.isDebugEnabled()) { - LOG.debug(msg); - } + LOG.debug(msg); return currentEditSeqId; } finally { reader.close(); -- 1.7.6.4