You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by je...@apache.org on 2016/03/24 18:02:30 UTC
hbase git commit: HBASE-14256 Flush task message may be confusing
when region is recovered (Gabor Liptak)
Repository: hbase
Updated Branches:
refs/heads/branch-1 ca819e1ef -> 1361a25e6
HBASE-14256 Flush task message may be confusing when region is recovered (Gabor Liptak)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1361a25e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1361a25e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1361a25e
Branch: refs/heads/branch-1
Commit: 1361a25e6dad87ad41cd1502adc511a5b9263c39
Parents: ca819e1
Author: Jerry He <je...@apache.org>
Authored: Thu Mar 24 10:01:53 2016 -0700
Committer: Jerry He <je...@apache.org>
Committed: Thu Mar 24 10:01:53 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/regionserver/HRegion.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1361a25e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index d3a31a3..cabfc39 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -1210,11 +1210,12 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
// force a flush only if region replication is set up for this region. Otherwise no need.
boolean forceFlush = getTableDesc().getRegionReplication() > 1;
- // force a flush first
- MonitoredTask status = TaskMonitor.get().createStatus(
- "Flushing region " + this + " because recovery is finished");
+ MonitoredTask status = TaskMonitor.get().createStatus("Recovering region " + this);
+
try {
+ // force a flush first
if (forceFlush) {
+ status.setStatus("Flushing region " + this + " because recovery is finished");
internalFlushcache(status);
}
@@ -1230,13 +1231,13 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
// We cannot rethrow this exception since we are being called from the zk thread. The
// region has already opened. In this case we log the error, but continue
LOG.warn(getRegionInfo().getEncodedName() + " : was not able to write region opening "
- + "event to WAL, continueing", e);
+ + "event to WAL, continuing", e);
}
} catch (IOException ioe) {
// Distributed log replay semantics does not necessarily require a flush, since the replayed
// data is already written again in the WAL. So failed flush should be fine.
LOG.warn(getRegionInfo().getEncodedName() + " : was not able to flush "
- + "event to WAL, continueing", ioe);
+ + "event to WAL, continuing", ioe);
} finally {
status.cleanup();
}