From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH v2 2/2] raft: decode even invalid states of raft Date: Thu, 29 Oct 2020 11:37:07 +0300 [thread overview] Message-ID: <20201029083707.309206-3-gorcunov@gmail.com> (raw) In-Reply-To: <20201029083707.309206-1-gorcunov@gmail.com> We should never trust the request data it can carry anything, thus lets make sure we're not decoding some trash into a string. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/lua/info.c | 2 +- src/box/raft.c | 29 +++++++++++++++++++++-------- src/box/raft.h | 6 +++++- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/box/lua/info.c b/src/box/lua/info.c index cac3fd475..92d48c96c 100644 --- a/src/box/lua/info.c +++ b/src/box/lua/info.c @@ -582,7 +582,7 @@ static int lbox_info_election(struct lua_State *L) { lua_createtable(L, 0, 4); - lua_pushstring(L, raft_state_strs[raft.state]); + lua_pushstring(L, raft_state_str(raft.state)); lua_setfield(L, -2, "state"); luaL_pushuint64(L, raft.volatile_term); lua_setfield(L, -2, "term"); diff --git a/src/box/raft.c b/src/box/raft.c index 7c546de8c..e1e60ce94 100644 --- a/src/box/raft.c +++ b/src/box/raft.c @@ -44,13 +44,6 @@ */ #define RAFT_RANDOM_ELECTION_FACTOR 0.1 -const char *raft_state_strs[] = { - NULL, - "follower", - "candidate", - "leader", -}; - /** Raft state of this instance. */ struct raft raft = { .leader = 0, @@ -70,6 +63,26 @@ struct raft raft = { .election_timeout = 5, }; +/** + * When decoding we should never trust that there is + * a valid data incomes. + */ +const char * +raft_state_str(uint32_t state) +{ + static const char *str[] = { + [0] = "invalid (0)", + [RAFT_STATE_FOLLOWER] = "follower", + [RAFT_STATE_CANDIDATE] = "candidate", + [RAFT_STATE_LEADER] = "leader", + }; + + if (state < lengthof(str)) + return str[state]; + + return "invalid (x)"; +}; + /** * Check if Raft is completely synced with disk. Meaning all its critical values * are in WAL. Only in that state the node can become a leader or a candidate. @@ -291,7 +304,7 @@ raft_request_to_string(const struct raft_request *req) } if (req->state != 0) { rc = snprintf(pos, size, ", state: %s", - raft_state_strs[req->state]); + raft_state_str(req->state)); assert(rc >= 0 && rc < size); pos += rc; size -= rc; diff --git a/src/box/raft.h b/src/box/raft.h index 82d5aa442..8293d7410 100644 --- a/src/box/raft.h +++ b/src/box/raft.h @@ -87,7 +87,11 @@ enum raft_state { RAFT_STATE_LEADER = 3, }; -extern const char *raft_state_strs[]; +/** + * Decode raft state into string representation. + */ +const char * +raft_state_str(uint32_t state); struct raft { /** Instance ID of leader of the current term. */ -- 2.26.2
next prev parent reply other threads:[~2020-10-29 8:37 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-29 8:37 [Tarantool-patches] [PATCH v2 0/2] raft: a few fixes for raft state symbolics Cyrill Gorcunov 2020-10-29 8:37 ` [Tarantool-patches] [PATCH v2 1/2] raft: raft_request_to_string -- don't hardcode size Cyrill Gorcunov 2020-10-30 7:21 ` Serge Petrenko 2020-10-29 8:37 ` Cyrill Gorcunov [this message] 2020-10-29 9:37 ` [Tarantool-patches] [PATCH v2 0/2] raft: a few fixes for raft state symbolics Cyrill Gorcunov 2020-11-02 22:02 ` Vladislav Shpilevoy
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=20201029083707.309206-3-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 2/2] raft: decode even invalid states of raft' \ /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