hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r681889 - /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Date Fri, 01 Aug 2008 23:01:09 GMT
Author: stack
Date: Fri Aug  1 16:01:08 2008
New Revision: 681889

URL: http://svn.apache.org/viewvc?rev=681889&view=rev
Log:
Fix deadlock caused by HBASE-790 patch

Modified:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=681889&r1=681888&r2=681889&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Fri Aug
 1 16:01:08 2008
@@ -503,9 +503,7 @@
                       HTableDescriptor.DEFAULT_MEMCACHE_FLUSH_SIZE);
     }
     this.memcacheFlushSize = flushSize;
-
-    this.blockingMemcacheSize = this.memcacheFlushSize *
-      conf.getInt("hbase.hregion.memcache.block.multiplier", 1);
+    this.blockingMemcacheSize = this.memcacheFlushSize * flushSize;
 
     // See if region is meant to run read-only.
     if (this.regionInfo.getTableDesc().isReadOnly()) {
@@ -1426,7 +1424,6 @@
   private synchronized void checkResources() {
     boolean blocked = false;
     while (this.memcacheSize.get() > this.blockingMemcacheSize) {
-      requestFlush();
       if (!blocked) {
         LOG.info("Blocking updates for '" + Thread.currentThread().getName() +
             "' on region " + Bytes.toString(getRegionName()) + ": Memcache size " +



Mime
View raw message