HBASE-14256 Flush task message may be confusing when region is recovered (Gabor Liptak)

This commit is contained in:
Jerry He 2016-03-24 10:01:53 -07:00
parent e71bc71c84
commit 7c93098210
1 changed files with 6 additions and 5 deletions

View File

@ -1217,11 +1217,12 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
// force a flush only if region replication is set up for this region. Otherwise no need. // force a flush only if region replication is set up for this region. Otherwise no need.
boolean forceFlush = getTableDesc().getRegionReplication() > 1; boolean forceFlush = getTableDesc().getRegionReplication() > 1;
// force a flush first MonitoredTask status = TaskMonitor.get().createStatus("Recovering region " + this);
MonitoredTask status = TaskMonitor.get().createStatus(
"Flushing region " + this + " because recovery is finished");
try { try {
// force a flush first
if (forceFlush) { if (forceFlush) {
status.setStatus("Flushing region " + this + " because recovery is finished");
internalFlushcache(status); internalFlushcache(status);
} }
@ -1237,13 +1238,13 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
// We cannot rethrow this exception since we are being called from the zk thread. The // 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 // region has already opened. In this case we log the error, but continue
LOG.warn(getRegionInfo().getEncodedName() + " : was not able to write region opening " LOG.warn(getRegionInfo().getEncodedName() + " : was not able to write region opening "
+ "event to WAL, continueing", e); + "event to WAL, continuing", e);
} }
} catch (IOException ioe) { } catch (IOException ioe) {
// Distributed log replay semantics does not necessarily require a flush, since the replayed // 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. // data is already written again in the WAL. So failed flush should be fine.
LOG.warn(getRegionInfo().getEncodedName() + " : was not able to flush " LOG.warn(getRegionInfo().getEncodedName() + " : was not able to flush "
+ "event to WAL, continueing", ioe); + "event to WAL, continuing", ioe);
} finally { } finally {
status.cleanup(); status.cleanup();
} }