From commits-return-64806-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Tue Jan 9 05:52:55 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 4F58A18072F for ; Tue, 9 Jan 2018 05:52:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3FDC3160C2C; Tue, 9 Jan 2018 04:52:55 +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 87774160C41 for ; Tue, 9 Jan 2018 05:52:54 +0100 (CET) Received: (qmail 2970 invoked by uid 500); 9 Jan 2018 04:52:53 -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 99301 invoked by uid 99); 9 Jan 2018 04:52:50 -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, 09 Jan 2018 04:52:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D6976F2DF6; Tue, 9 Jan 2018 04:52:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhangduo@apache.org To: commits@hbase.apache.org Date: Tue, 09 Jan 2018 04:53:12 -0000 Message-Id: <82e84e2947ad4590a47371db14c9a6c4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/43] hbase git commit: HBASE-19642 Fix locking for peer modification procedure HBASE-19642 Fix locking for peer modification procedure Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/519bd9b6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/519bd9b6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/519bd9b6 Branch: refs/heads/HBASE-19397 Commit: 519bd9b6dd0628fd6dba920dfb04641c3b2ce628 Parents: decfcd3 Author: zhangduo Authored: Wed Dec 27 18:27:13 2017 +0800 Committer: zhangduo Committed: Tue Jan 9 12:43:00 2018 +0800 ---------------------------------------------------------------------- .../procedure/MasterProcedureScheduler.java | 14 +++++++++++++ .../master/replication/ModifyPeerProcedure.java | 21 +++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/519bd9b6/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java index a25217c..4ecb3b1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java @@ -610,6 +610,20 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler { public boolean requireExclusiveLock(Procedure proc) { return requirePeerExclusiveLock((PeerProcedureInterface) proc); } + + @Override + public boolean isAvailable() { + if (isEmpty()) { + return false; + } + if (getLockStatus().hasExclusiveLock()) { + // if we have an exclusive lock already taken + // only child of the lock owner can be executed + Procedure nextProc = peek(); + return nextProc != null && getLockStatus().hasLockAccess(nextProc); + } + return true; + } } // ============================================================================ http://git-wip-us.apache.org/repos/asf/hbase/blob/519bd9b6/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java index 279fbc7..a682606 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java @@ -46,6 +46,8 @@ public abstract class ModifyPeerProcedure protected String peerId; + private volatile boolean locked; + // used to keep compatible with old client where we can only returns after updateStorage. protected ProcedurePrepareLatch latch; @@ -145,17 +147,30 @@ public abstract class ModifyPeerProcedure @Override protected LockState acquireLock(MasterProcedureEnv env) { - return env.getProcedureScheduler().waitPeerExclusiveLock(this, peerId) - ? LockState.LOCK_EVENT_WAIT - : LockState.LOCK_ACQUIRED; + if (env.getProcedureScheduler().waitPeerExclusiveLock(this, peerId)) { + return LockState.LOCK_EVENT_WAIT; + } + locked = true; + return LockState.LOCK_ACQUIRED; } @Override protected void releaseLock(MasterProcedureEnv env) { + locked = false; env.getProcedureScheduler().wakePeerExclusiveLock(this, peerId); } @Override + protected boolean holdLock(MasterProcedureEnv env) { + return true; + } + + @Override + protected boolean hasLock(MasterProcedureEnv env) { + return locked; + } + + @Override protected void rollbackState(MasterProcedureEnv env, PeerModificationState state) throws IOException, InterruptedException { if (state == PeerModificationState.PRE_PEER_MODIFICATION) {