From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id DF4AC6F87A; Fri, 16 Apr 2021 19:30:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DF4AC6F87A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618590650; bh=eWWozJ3Dit57557yeUETtqAfafPzTLFz8C2vGtgO24s=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=rniT6iezWrpuoYH9U72NLgIp+v/8/zbH/juAa6uAED2pQQ7/h6cOxslHCFOmLCgUE ey7CBGvRW1wyQUXqoh7wOl+v8wfB6PThMPt8HprXWA8DDMkPK6UNjkNIhHcXj0BoW1 ISl9TCU/QolEYsfjgw3YkzYY0DYcCyRAElrB1ano= Received: from smtp17.mail.ru (smtp17.mail.ru [94.100.176.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 9A54E74B74 for ; Fri, 16 Apr 2021 19:26:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9A54E74B74 Received: by smtp17.mail.ru with esmtpa (envelope-from ) id 1lXRI9-00008e-Lx; Fri, 16 Apr 2021 19:26:02 +0300 To: v.shpilevoy@tarantool.org, gorcunov@gmail.com Date: Fri, 16 Apr 2021 19:25:41 +0300 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480257C85EA0BB7A95D5E28B957962BB550182A05F538085040790ADEE17D65496C0B20428C93AEDF1065E295562BBD3D20367C34F5E07A9136 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE76C33606E6E3377E0EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637DAE863916B47044D8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2C988A0320C96EB47962904FAB35D1DA09414A38D98B987DBD2E47CDBA5A96583C09775C1D3CA48CFE97D2AE7161E217F117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE74796267E12EBBF229FA2833FD35BB23DF004C90652538430302FCEF25BFAB3454AD6D5ED66289B5278DA827A17800CE73F177C2462EA638BD32BA5DBAC0009BE395957E7521B51C20BC6067A898B09E4090A508E0FED6299176DF2183F8FC7C0D6C9C7193B21079BCD04E86FAF290E2D7E9C4E3C761E06A71DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3CE9959E2676FD87735872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8183A4AFAF3EA6BDC44E1F4276B80994196BF1196BB3248DD4BCA75777AE932FB087691060E164B67499C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34AC223B6CC5B2DFAC88E14A3CFE952D06BDB011241F5146A5C75B29F415CBCEE5172223FEC49DE0161D7E09C32AA3244CEEEEA9141E0AE95A74DBACF341E3BA34F26BFA4C8A6946B8927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj3S6P1v0GIqTdsPF7MKddvA== X-Mailru-Sender: 583F1D7ACE8F49BDD2846D59FC20E9F8DF49C5E8585DB537DDF8FAC95FE16B6F9CF26D2872A25435424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v4 10/12] election: support manual elections in clear_synchro_queue() X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Serge Petrenko via Tarantool-patches Reply-To: Serge Petrenko Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch adds support for manual elections from `box.ctl.clear_synchro_queue()`. When an instance is in `election_mode='manual'`, calling `clear_synchro_queue()` will make it start a new election round. Follow-up #5445 Part of #3055 @TarantoolBot document Title: describe election_mode='manual' Manual election mode is introduced. It may be used when the user wants to control which instance is the leader explicitly instead of relying on Raft election algorithm. When an instance is configured with `election_mode='manual'`, it behaves as follows: 1) By default, the instance acts like a voter: it is read-only and may vote for other instances that are candidates. 2) Once `box.ctl.clear_synchro_queue()` is called, the instance becomes a candidate and starts a new election round. If the instance wins the elections, it remains leader, but won't participate in any new elections. --- src/box/box.cc | 71 ++++++++++++++++++++++++++++++++++++++++--- src/box/errcode.h | 2 ++ src/box/raft.c | 30 +++++++++++++++--- src/box/raft.h | 3 ++ test/box/error.result | 2 ++ 5 files changed, 99 insertions(+), 9 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index d5a55a30a..fcd812c09 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -1521,12 +1521,75 @@ box_clear_synchro_queue(bool try_wait) if (!is_box_configured || raft_node_term(box_raft(), instance_id) == box_raft()->term) return 0; + + bool run_elections = false; + + switch (box_election_mode) { + case ELECTION_MODE_OFF: + break; + case ELECTION_MODE_VOTER: + assert(box_raft()->state == RAFT_STATE_FOLLOWER); + diag_set(ClientError, ER_UNSUPPORTED, "election_mode='voter'", + "manual elections"); + return -1; + case ELECTION_MODE_MANUAL: + assert(box_raft()->state == RAFT_STATE_FOLLOWER); + run_elections = true; + try_wait = false; + break; + case ELECTION_MODE_CANDIDATE: + /* + * Leader elections are enabled, and this instance is allowed to + * promote only if it's already an elected leader. No manual + * elections. + */ + if (box_raft()->state != RAFT_STATE_LEADER) { + diag_set(ClientError, ER_UNSUPPORTED, "election_mode=" + "'candidate'", "manual elections"); + return -1; + } + break; + default: + unreachable(); + } + uint32_t former_leader_id = txn_limbo.owner_id; int64_t wait_lsn = txn_limbo.confirmed_lsn; int rc = 0; int quorum = replication_synchro_quorum; in_clear_synchro_queue = true; + if (run_elections) { + /* + * Make this instance a candidate and run until some leader, not + * necessarily this instance, emerges. + */ + raft_start_candidate(box_raft()); + /* + * Trigger new elections without waiting for an old leader to + * disappear. + */ + raft_new_term(box_raft()); + box_raft_wait_leader_found(); + /* + * Do not reset raft mode if it was changed while running the + * elections. + */ + if (box_election_mode == ELECTION_MODE_MANUAL) + raft_stop_candidate(box_raft(), false); + if (!box_raft()->is_enabled) { + diag_set(ClientError, ER_RAFT_DISABLED); + in_clear_synchro_queue = false; + return -1; + } + if (box_raft()->state != RAFT_STATE_LEADER) { + diag_set(ClientError, ER_INTERFERING_PROMOTE, + box_raft()->leader); + in_clear_synchro_queue = false; + return -1; + } + } + if (txn_limbo_is_empty(&txn_limbo)) goto promote; @@ -1544,12 +1607,10 @@ box_clear_synchro_queue(bool try_wait) * transactions. Exit in case someone did that for us. */ if (former_leader_id != txn_limbo.owner_id) { - /* - * TODO: error once we see someone else has become the - * leader already. - */ + diag_set(ClientError, ER_INTERFERING_PROMOTE, + txn_limbo.owner_id); in_clear_synchro_queue = false; - return 0; + return -1; } } diff --git a/src/box/errcode.h b/src/box/errcode.h index c63191fb6..d93820e96 100644 --- a/src/box/errcode.h +++ b/src/box/errcode.h @@ -275,6 +275,8 @@ struct errcode_record { /*220 */_(ER_TOO_EARLY_SUBSCRIBE, "Can't subscribe non-anonymous replica %s until join is done") \ /*221 */_(ER_SQL_CANT_ADD_AUTOINC, "Can't add AUTOINCREMENT: space %s can't feature more than one AUTOINCREMENT field") \ /*222 */_(ER_QUORUM_WAIT, "Couldn't wait for quorum %d: %s") \ + /*223 */_(ER_INTERFERING_PROMOTE, "Instance with replica id %u was promoted first") \ + /*224 */_(ER_RAFT_DISABLED, "Elections were turned off while running box.ctl.promote()")\ /* * !IMPORTANT! Please follow instructions at start of the file diff --git a/src/box/raft.c b/src/box/raft.c index 285dbe4fd..425353207 100644 --- a/src/box/raft.c +++ b/src/box/raft.c @@ -91,11 +91,11 @@ box_raft_update_synchro_queue(struct raft *raft) * If the node became a leader, it means it will ignore all records from * all the other nodes, and won't get late CONFIRM messages anyway. Can * clear the queue without waiting for confirmations. - * It's alright that the user may have called clear_synchro_queue - * manually. In this case the call below will exit immediately and we'll - * simply log a warning. + * In case these are manual elections, we are already in the middle of a + * `clear_synchro_queue` call. No need to call it once again. */ - if (raft->state == RAFT_STATE_LEADER) { + if (raft->state == RAFT_STATE_LEADER && + box_election_mode != ELECTION_MODE_MANUAL) { int rc = 0; uint32_t errcode = 0; do { @@ -336,6 +336,28 @@ fail: panic("Could not write a raft request to WAL\n"); } +static int +box_raft_wait_leader_found_f(struct trigger *trig, void *event) +{ + struct raft *raft = event; + assert(raft == box_raft()); + struct fiber *waiter = trig->data; + if (raft->leader != REPLICA_ID_NIL || !raft->is_enabled) + fiber_wakeup(waiter); + return 0; +} + +void +box_raft_wait_leader_found(void) +{ + struct trigger trig; + trigger_create(&trig, box_raft_wait_leader_found_f, fiber(), NULL); + raft_on_update(box_raft(), &trig); + fiber_yield(); + assert(box_raft()->leader != REPLICA_ID_NIL || !box_raft()->is_enabled); + trigger_clear(&trig); +} + void box_raft_init(void) { diff --git a/src/box/raft.h b/src/box/raft.h index 15f4e80d9..8fce423e1 100644 --- a/src/box/raft.h +++ b/src/box/raft.h @@ -97,6 +97,9 @@ box_raft_checkpoint_remote(struct raft_request *req); int box_raft_process(struct raft_request *req, uint32_t source); +void +box_raft_wait_leader_found(); + void box_raft_init(void); diff --git a/test/box/error.result b/test/box/error.result index 7761c6949..cc8cbaaa9 100644 --- a/test/box/error.result +++ b/test/box/error.result @@ -441,6 +441,8 @@ t; | 220: box.error.TOO_EARLY_SUBSCRIBE | 221: box.error.SQL_CANT_ADD_AUTOINC | 222: box.error.QUORUM_WAIT + | 223: box.error.INTERFERING_PROMOTE + | 224: box.error.RAFT_DISABLED | ... test_run:cmd("setopt delimiter ''"); -- 2.24.3 (Apple Git-128)