hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From la...@apache.org
Subject git commit: mutateRowsWithLocks might require updatesLock.readLock with waitTime=0. (cuijianwei)
Date Thu, 31 Jul 2014 23:55:23 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.94 812be0ca4 -> 8bf1a4d17


mutateRowsWithLocks might require updatesLock.readLock with waitTime=0. (cuijianwei)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8bf1a4d1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8bf1a4d1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8bf1a4d1

Branch: refs/heads/0.94
Commit: 8bf1a4d175a546b328319941a78b6eb0a8213013
Parents: 812be0c
Author: Lars Hofhansl <larsh@apache.org>
Authored: Thu Jul 31 16:55:06 2014 -0700
Committer: Lars Hofhansl <larsh@apache.org>
Committed: Thu Jul 31 16:55:06 2014 -0700

----------------------------------------------------------------------
 src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/8bf1a4d1/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 31959b4..eaa02d1 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -5110,7 +5110,7 @@ public class HRegion implements HeapSize { // , Writable{
       }
 
       // 3. acquire the region lock
-      lock(this.updatesLock.readLock(), acquiredLocks.size());
+      lock(this.updatesLock.readLock(), acquiredLocks.size() == 0 ? 1 : acquiredLocks.size());
       locked = true;
 
       // 4. Get a mvcc write number


Mime
View raw message