Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33A4918B12 for ; Wed, 23 Dec 2015 17:59:04 +0000 (UTC) Received: (qmail 36707 invoked by uid 500); 23 Dec 2015 17:59:04 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 36561 invoked by uid 500); 23 Dec 2015 17:59:04 -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 36451 invoked by uid 99); 23 Dec 2015 17:59:04 -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; Wed, 23 Dec 2015 17:59:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D6144E01F2; Wed, 23 Dec 2015 17:59:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mbertozzi@apache.org To: commits@hbase.apache.org Date: Wed, 23 Dec 2015 17:59:04 -0000 Message-Id: <5e5a949c03cc4e16b1b179879eb4c0e6@git.apache.org> In-Reply-To: <6486b1fbbf7b43ad96bbede2df9b6b09@git.apache.org> References: <6486b1fbbf7b43ad96bbede2df9b6b09@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hbase git commit: HBASE-15030 Deadlock in master TableNamespaceManager while running IntegrationTestDDLMasterFailover HBASE-15030 Deadlock in master TableNamespaceManager while running IntegrationTestDDLMasterFailover Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d65210d2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d65210d2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d65210d2 Branch: refs/heads/branch-1 Commit: d65210d2138a59b91aef6443b6b26435a27a587a Parents: 59cca62 Author: Matteo Bertozzi Authored: Wed Dec 23 09:46:18 2015 -0800 Committer: Matteo Bertozzi Committed: Wed Dec 23 09:56:21 2015 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/master/TableNamespaceManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d65210d2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java index f4be427..a4746c8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java @@ -134,7 +134,7 @@ public class TableNamespaceManager { return nsTable; } - private synchronized boolean acquireSharedLock() throws IOException { + private boolean acquireSharedLock() throws IOException { try { return rwLock.readLock().tryLock(sharedLockTimeoutMs, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { @@ -142,11 +142,11 @@ public class TableNamespaceManager { } } - public synchronized void releaseSharedLock() { + public void releaseSharedLock() { rwLock.readLock().unlock(); } - public synchronized boolean acquireExclusiveLock() { + public boolean acquireExclusiveLock() { try { return rwLock.writeLock().tryLock(exclusiveLockTimeoutMs, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { @@ -154,7 +154,7 @@ public class TableNamespaceManager { } } - public synchronized void releaseExclusiveLock() { + public void releaseExclusiveLock() { rwLock.writeLock().unlock(); }