You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/10/22 21:34:13 UTC
svn commit: r1401037 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Author: tedyu
Date: Mon Oct 22 19:34:12 2012
New Revision: 1401037
URL: http://svn.apache.org/viewvc?rev=1401037&view=rev
Log:
HBASE-7001 Fix the RCN Correctness Warning in MemStoreFlusher class (Liang Xie)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=1401037&r1=1401036&r2=1401037&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java Mon Oct 22 19:34:12 2012
@@ -350,7 +350,7 @@ class MemStoreFlusher extends HasThread
*/
private boolean flushRegion(final FlushRegionEntry fqe) {
HRegion region = fqe.region;
- if (!fqe.region.getRegionInfo().isMetaRegion() &&
+ if (!region.getRegionInfo().isMetaRegion() &&
isTooManyStoreFiles(region)) {
if (fqe.isMaximumWait(this.blockingWaitTime)) {
LOG.info("Waited " + (System.currentTimeMillis() - fqe.createTime) +
@@ -366,9 +366,9 @@ class MemStoreFlusher extends HasThread
if (!this.server.compactSplitThread.requestSplit(region)) {
try {
this.server.compactSplitThread.requestCompaction(region, getName());
- } catch (IOException e) {
- LOG.error("Cache flush failed" +
- (region != null ? (" for region " + Bytes.toStringBinary(region.getRegionName())) : ""),
+ } catch (IOException e) {
+ LOG.error(
+ "Cache flush failed for region " + Bytes.toStringBinary(region.getRegionName()),
RemoteExceptionHandler.checkIOException(e));
}
}