From: Serge Petrenko via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org, gorcunov@gmail.com Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v2 7/9] replication: introduce a new election mode: "manual" Date: Mon, 12 Apr 2021 22:40:20 +0300 [thread overview] Message-ID: <ad75a0ac7e2be599f687b6afd635217c6c135240.1618256019.git.sergepetrenko@tarantool.org> (raw) In-Reply-To: <cover.1618256019.git.sergepetrenko@tarantool.org> When an instance is configured in "manual" election mode, it behaves as a voter for most of the time, until `box.ctl.promote()` is called. Once `box.ctl.promote()` is called the instance will behave as a candidate for a full election round, e.g. until the leader is known. If the instance wins the elections, it remains in `leader` state until the next elections. Otherwise the instance returns to `voter` state. Follow-up #5445 Part of #3055 --- src/box/box.cc | 37 +++++++++++++++++--------- src/box/raft.c | 2 ++ src/box/raft.h | 17 ++++++++++++ test/replication/election_basic.result | 4 +-- 4 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index aae57ec29..b77b0a08d 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -680,17 +680,27 @@ box_check_uri(const char *source, const char *option_name) } } -static const char * +static enum election_mode box_check_election_mode(void) { const char *mode = cfg_gets("election_mode"); - if (mode == NULL || (strcmp(mode, "off") != 0 && - strcmp(mode, "voter") != 0 && strcmp(mode, "candidate") != 0)) { - diag_set(ClientError, ER_CFG, "election_mode", "the value must " - "be a string 'off' or 'voter' or 'candidate'"); - return NULL; - } - return mode; + if (mode == NULL) + goto error; + + if (strcmp(mode, "off") == 0) + return ELECTION_MODE_OFF; + else if (strcmp(mode, "voter") == 0) + return ELECTION_MODE_VOTER; + else if (strcmp(mode, "manual") == 0) + return ELECTION_MODE_MANUAL; + else if (strcmp(mode, "candidate") == 0) + return ELECTION_MODE_CANDIDATE; + +error: + diag_set(ClientError, ER_CFG, "election_mode", + "the value must be one of the following strings: " + "'off', 'voter', 'candidate', 'manual'"); + return ELECTION_MODE_INVALID; } static double @@ -1113,7 +1123,7 @@ box_check_config(void) box_check_uri(cfg_gets("listen"), "listen"); box_check_instance_uuid(&uuid); box_check_replicaset_uuid(&uuid); - if (box_check_election_mode() == NULL) + if (box_check_election_mode() == ELECTION_MODE_INVALID) diag_raise(); if (box_check_election_timeout() < 0) diag_raise(); @@ -1147,11 +1157,12 @@ box_check_config(void) int box_set_election_mode(void) { - const char *mode = box_check_election_mode(); - if (mode == NULL) + enum election_mode mode = box_check_election_mode(); + if (mode == ELECTION_MODE_INVALID) return -1; - raft_cfg_is_candidate(box_raft(), strcmp(mode, "candidate") == 0); - raft_cfg_is_enabled(box_raft(), strcmp(mode, "off") != 0); + box_election_mode = mode; + raft_cfg_is_candidate(box_raft(), mode == ELECTION_MODE_CANDIDATE); + raft_cfg_is_enabled(box_raft(), mode != ELECTION_MODE_OFF); return 0; } diff --git a/src/box/raft.c b/src/box/raft.c index cfd898db0..285dbe4fd 100644 --- a/src/box/raft.c +++ b/src/box/raft.c @@ -44,6 +44,8 @@ struct raft box_raft_global = { .state = 0, }; +enum election_mode box_election_mode = ELECTION_MODE_INVALID; + /** * A trigger executed each time the Raft state machine updates any * of its visible attributes. diff --git a/src/box/raft.h b/src/box/raft.h index 1c59f17e6..15f4e80d9 100644 --- a/src/box/raft.h +++ b/src/box/raft.h @@ -35,8 +35,25 @@ extern "C" { #endif +enum election_mode { + ELECTION_MODE_INVALID = -1, + ELECTION_MODE_OFF = 0, + ELECTION_MODE_VOTER = 1, + ELECTION_MODE_MANUAL = 2, + ELECTION_MODE_CANDIDATE = 3, +}; + struct raft_request; +/** + * box_election_mode - current mode of operation for raft. Some modes correspond + * to RAFT operation modes directly, like CANDIDATE, VOTER and OFF. + * There's a mode which does not map to raft operation mode directly: + * MANUAL. In this mode RAFT usually operates as a voter, but it may become a + * candidate for some period of time when user calls `box.ctl.promote()` + */ +extern enum election_mode box_election_mode; + /** Raft state of this instance. */ static inline struct raft * box_raft(void) diff --git a/test/replication/election_basic.result b/test/replication/election_basic.result index 4d7d33f2b..d5320b3ff 100644 --- a/test/replication/election_basic.result +++ b/test/replication/election_basic.result @@ -22,8 +22,8 @@ box.cfg{election_mode = 100} | ... box.cfg{election_mode = '100'} | --- - | - error: 'Incorrect value for option ''election_mode'': the value must be a string - | ''off'' or ''voter'' or ''candidate''' + | - error: 'Incorrect value for option ''election_mode'': the value must be one of the + | following strings: ''off'', ''voter'', ''candidate'', ''manual''' | ... box.cfg{election_timeout = -1} | --- -- 2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-04-12 19:43 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-12 19:40 [Tarantool-patches] [PATCH v2 0/9] raft: introduce manual elections and fix a bug with re-applying rolled back transactions Serge Petrenko via Tarantool-patches 2021-04-12 19:40 ` [Tarantool-patches] [PATCH v2 1/9] wal: enrich row's meta information with sync replication flags Serge Petrenko via Tarantool-patches 2021-04-13 11:50 ` Cyrill Gorcunov via Tarantool-patches 2021-04-13 13:51 ` Serge Petrenko via Tarantool-patches 2021-04-13 14:16 ` Cyrill Gorcunov via Tarantool-patches 2021-04-13 13:09 ` Cyrill Gorcunov via Tarantool-patches 2021-04-13 13:29 ` Serge Petrenko via Tarantool-patches 2021-04-12 19:40 ` [Tarantool-patches] [PATCH v2 2/9] xrow: introduce a PROMOTE entry Serge Petrenko via Tarantool-patches 2021-04-13 14:15 ` Cyrill Gorcunov via Tarantool-patches 2021-04-14 9:12 ` Serge Petrenko via Tarantool-patches 2021-04-14 10:00 ` Cyrill Gorcunov via Tarantool-patches 2021-04-12 19:40 ` [Tarantool-patches] [PATCH v2 3/9] box: actualise iproto_key_type array Serge Petrenko via Tarantool-patches 2021-04-12 19:40 ` [Tarantool-patches] [PATCH v2 4/9] box: make clear_synchro_queue() write a PROMOTE entry instead of CONFIRM + ROLLBACK Serge Petrenko via Tarantool-patches 2021-04-13 14:33 ` Cyrill Gorcunov via Tarantool-patches 2021-04-14 8:23 ` Serge Petrenko via Tarantool-patches 2021-04-14 8:34 ` Cyrill Gorcunov via Tarantool-patches 2021-04-14 9:12 ` Serge Petrenko via Tarantool-patches 2021-04-12 19:40 ` [Tarantool-patches] [PATCH v2 5/9] box: write PROMOTE even for empty limbo Serge Petrenko via Tarantool-patches 2021-04-12 19:40 ` [Tarantool-patches] [PATCH v2 6/9] raft: keep track of greatest known term and filter replication sources based on that Serge Petrenko via Tarantool-patches 2021-04-12 19:40 ` Serge Petrenko via Tarantool-patches [this message] 2021-04-12 19:40 ` [Tarantool-patches] [PATCH v2 8/9] Support manual elections in `box.ctl.clear_synchro_queue()` Serge Petrenko via Tarantool-patches 2021-04-12 19:40 ` [Tarantool-patches] [PATCH v2 9/9] box.ctl: rename clear_synchro_queue to promote Serge Petrenko via Tarantool-patches 2021-04-13 14:42 ` [Tarantool-patches] [PATCH v2 0/9] raft: introduce manual elections and fix a bug with re-applying rolled back transactions Cyrill Gorcunov via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ad75a0ac7e2be599f687b6afd635217c6c135240.1618256019.git.sergepetrenko@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=sergepetrenko@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 7/9] replication: introduce a new election mode: "manual"' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox