Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CEFA4200CFF for ; Tue, 1 Aug 2017 21:41:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CDD8E1651F3; Tue, 1 Aug 2017 19:41:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2F08D16520C for ; Tue, 1 Aug 2017 21:41:11 +0200 (CEST) Received: (qmail 52137 invoked by uid 500); 1 Aug 2017 19:41:10 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 51898 invoked by uid 99); 1 Aug 2017 19:41:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Aug 2017 19:41:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 27173F321C; Tue, 1 Aug 2017 19:41:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: apurtell@apache.org To: commits@hbase.apache.org Date: Tue, 01 Aug 2017 19:41:12 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/6] hbase git commit: HBASE-18487 Minor fixes in row lock implementation archived-at: Tue, 01 Aug 2017 19:41:12 -0000 HBASE-18487 Minor fixes in row lock implementation Signed-off-by: Andrew Purtell Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/84368110 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/84368110 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/84368110 Branch: refs/heads/branch-1.3 Commit: 84368110268ba0d2e75ce5acff2704eef615e3c6 Parents: c799649 Author: James Taylor Authored: Mon Jul 31 11:42:48 2017 -0700 Committer: Andrew Purtell Committed: Tue Aug 1 11:30:27 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/HRegion.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/84368110/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 42a2389..90f3079 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 @@ -5321,6 +5321,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi traceScope.getSpan().addTimelineAnnotation("Getting a " + (readLock?"readLock":"writeLock")); } + boolean success = false; try { // Keep trying until we have a lock or error out. // TODO: do we need to add a time component here? @@ -5350,11 +5351,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi traceScope.getSpan().addTimelineAnnotation("Failed to get row lock"); } result = null; - // Clean up the counts just in case this was the thing keeping the context alive. - rowLockContext.cleanUp(); throw new IOException("Timed out waiting for lock for row: " + rowKey); } rowLockContext.setThreadName(Thread.currentThread().getName()); + success = true; return result; } catch (InterruptedException ie) { LOG.warn("Thread interrupted waiting for lock on row: " + rowKey); @@ -5366,6 +5366,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi Thread.currentThread().interrupt(); throw iie; } finally { + // Clean up the counts just in case this was the thing keeping the context alive. + if (!success && rowLockContext != null) { + rowLockContext.cleanUp(); + } if (traceScope != null) { traceScope.close(); } @@ -5423,7 +5427,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi long c = count.decrementAndGet(); if (c <= 0) { synchronized (lock) { - if (count.get() <= 0 ){ + if (count.get() <= 0 && usable.get()){ // Don't attempt to remove row if already removed usable.set(false); RowLockContext removed = lockedRows.remove(row); assert removed == this: "we should never remove a different context";