You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by jx...@apache.org on 2012/12/18 18:53:58 UTC

svn commit: r1423551 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Author: jxiang
Date: Tue Dec 18 17:53:57 2012
New Revision: 1423551

URL: http://svn.apache.org/viewvc?rev=1423551&view=rev
Log:
HBASE-7376 Acquiring readLock does not apply timeout in HRegion#flushcache (binlijin)

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

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1423551&r1=1423550&r2=1423551&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Dec 18 17:53:57 2012
@@ -1403,7 +1403,8 @@ public class HRegion implements HeapSize
     }
     MonitoredTask status = TaskMonitor.get().createStatus("Flushing " + this);
     status.setStatus("Acquiring readlock on region");
-    lock(lock.readLock());
+    // block waiting for the lock for flushing cache
+    lock.readLock().lock();
     try {
       if (this.closed.get()) {
         LOG.debug("Skipping flush on " + this + " because closed");