You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2014/08/01 01:51:50 UTC
git commit: mutateRowsWithLocks might require updatesLock.readLock
with waitTime=0. ( cuijianwei)
Repository: hbase
Updated Branches:
refs/heads/0.98 71f2e0dc2 -> e1bc1af5c
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/e1bc1af5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e1bc1af5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e1bc1af5
Branch: refs/heads/0.98
Commit: e1bc1af5cb09d822669a3bf340bb257367c35db1
Parents: 71f2e0d
Author: Lars Hofhansl <la...@apache.org>
Authored: Thu Jul 31 16:28:51 2014 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Thu Jul 31 16:49:59 2014 -0700
----------------------------------------------------------------------
.../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/e1bc1af5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 3c680b6..82204e8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -4953,7 +4953,7 @@ public class HRegion implements HeapSize { // , Writable{
acquiredRowLocks.add(getRowLock(row));
}
// 3. Region lock
- lock(this.updatesLock.readLock(), acquiredRowLocks.size());
+ lock(this.updatesLock.readLock(), acquiredRowLocks.size() == 0 ? 1 : acquiredRowLocks.size());
locked = true;
long now = EnvironmentEdgeManager.currentTimeMillis();