You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jg...@apache.org on 2011/10/28 23:55:21 UTC
svn commit: r1190612 - in /hbase/branches/0.92: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Author: jgray
Date: Fri Oct 28 21:55:20 2011
New Revision: 1190612
URL: http://svn.apache.org/viewvc?rev=1190612&view=rev
Log:
HBASE-4687 regionserver may miss zk-heartbeats to master when replaying edits at region open (prakash via jgray)
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1190612&r1=1190611&r2=1190612&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Oct 28 21:55:20 2011
@@ -389,6 +389,8 @@ Release 0.92.0 - Unreleased
HBASE-4680 FSUtils.isInSafeMode() checks should operate on HBase root dir,
where we have permissions
HBASE-4641 Block cache can be mistakenly instantiated on Master (jgray)
+ HBASE-4687 regionserver may miss zk-heartbeats to master when replaying
+ edits at region open (prakash via jgray)
TESTS
HBASE-4492 TestRollingRestart fails intermittently
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1190612&r1=1190611&r2=1190612&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Fri Oct 28 21:55:20 2011
@@ -2257,7 +2257,8 @@ public class HRegion implements HeapSize
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);
@@ -2271,6 +2272,7 @@ public class HRegion implements HeapSize
long intervalEdits = 0;
HLog.Entry entry;
Store store = null;
+ boolean reported_once = false;
try {
// How many edits seen before we check elapsed time
@@ -2303,6 +2305,7 @@ public class HRegion implements HeapSize
status.abort(msg);
throw new IOException(msg);
}
+ reported_once = true;
lastReport = cur;
}
}
@@ -2382,14 +2385,14 @@ public class HRegion implements HeapSize
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();