From: Sergey Petrenko via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>, gorcunov@gmail.com Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v4 10/16] box: make promote always bump the term Date: Thu, 29 Jul 2021 23:46:52 +0300 [thread overview] Message-ID: <45a9ea6e-d72e-b2d7-c8b9-0454e6f3a2a3@tarantool.org> (raw) In-Reply-To: <82fb422a-7a6c-d52f-06ba-8e053b2cd8bb@tarantool.org> 27.07.2021 02:45, Vladislav Shpilevoy пишет: > Thanks for the fixes! > >> diff --git a/src/box/raft.c b/src/box/raft.c >> index eb62e9630..35c471f58 100644 >> --- a/src/box/raft.c >> +++ b/src/box/raft.c >> @@ -394,6 +394,46 @@ box_raft_wait_term_outcome(void) > <...> > >> + >> +int >> +box_raft_wait_term_persisted(void) >> +{ >> + if (box_raft()->term == box_raft()->volatile_term) >> + return 0; >> + struct raft_wait_persisted_data data = { >> + .waiter = fiber(), >> + .term = box_raft()->volatile_term, >> + }; >> + struct trigger trig; >> + trigger_create(&trig, box_raft_wait_term_persisted_f, &data, NULL); >> + raft_on_update(box_raft(), &trig); >> + >> + do { >> + fiber_yield(); >> + } while (box_raft()->term < data.term && !fiber_is_cancelled()); > Could I ask you please to cache box_raft() into a variable? > It would be shorter and slightly easier to read. Sure. Done. =========================== diff --git a/src/box/raft.c b/src/box/raft.c index 35c471f58..bef9414c3 100644 --- a/src/box/raft.c +++ b/src/box/raft.c @@ -412,19 +412,20 @@ box_raft_wait_term_persisted_f(struct trigger *trig, void *event) int box_raft_wait_term_persisted(void) { - if (box_raft()->term == box_raft()->volatile_term) + struct raft *raft = box_raft(); + if (raft->term == raft->volatile_term) return 0; struct raft_wait_persisted_data data = { .waiter = fiber(), - .term = box_raft()->volatile_term, + .term = raft->volatile_term, }; struct trigger trig; trigger_create(&trig, box_raft_wait_term_persisted_f, &data, NULL); - raft_on_update(box_raft(), &trig); + raft_on_update(raft, &trig); do { fiber_yield(); - } while (box_raft()->term < data.term && !fiber_is_cancelled()); + } while (raft->term < data.term && !fiber_is_cancelled()); trigger_clear(&trig); if (fiber_is_cancelled()) { =========================== >> + >> + trigger_clear(&trig); >> + if (fiber_is_cancelled()) { >> + diag_set(FiberIsCancelled); >> + return -1; >> + } >> + return 0; >> +}
next prev parent reply other threads:[~2021-07-29 20:47 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-14 18:25 [Tarantool-patches] [PATCH v4 00/16] forbid implicit limbo ownership transition Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 01/16] replication: always send raft state to subscribers Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 02/16] txn_limbo: fix promote term filtering Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 03/16] txn_limbo: persist the latest effective promote in snapshot Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 04/16] replication: encode version in JOIN request Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 05/16] replication: add META stage to JOIN Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 06/16] replication: send latest effective promote in initial join Serge Petrenko via Tarantool-patches 2021-07-21 23:24 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-23 7:44 ` Sergey Petrenko via Tarantool-patches 2021-07-26 23:43 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 07/16] replication: send current Raft term in join response Serge Petrenko via Tarantool-patches 2021-07-21 23:24 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-23 7:44 ` Sergey Petrenko via Tarantool-patches 2021-07-26 23:43 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-29 20:46 ` Sergey Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 08/16] raft: refactor raft_new_term() Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 09/16] box: split promote() into reasonable parts Serge Petrenko via Tarantool-patches 2021-07-21 23:26 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-23 7:45 ` Sergey Petrenko via Tarantool-patches 2021-07-26 23:44 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-29 20:46 ` Sergey Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 10/16] box: make promote always bump the term Serge Petrenko via Tarantool-patches 2021-07-26 23:45 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-29 20:46 ` Sergey Petrenko via Tarantool-patches [this message] 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 11/16] box: make promote on the current leader a no-op Serge Petrenko via Tarantool-patches 2021-07-21 23:26 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-23 7:45 ` Sergey Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 12/16] box: fix an assertion failure after a spurious wakeup in promote Serge Petrenko via Tarantool-patches 2021-07-21 23:29 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-23 7:45 ` Sergey Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 13/16] box: allow calling promote on a candidate Serge Petrenko via Tarantool-patches 2021-07-15 14:06 ` Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 14/16] box: extract promote() settings to a separate method Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 15/16] replication: forbid implicit limbo owner transition Serge Petrenko via Tarantool-patches 2021-07-14 18:25 ` [Tarantool-patches] [PATCH v4 16/16] box: introduce `box.ctl.demote` Serge Petrenko via Tarantool-patches 2021-07-15 17:13 ` Serge Petrenko via Tarantool-patches 2021-07-15 20:11 ` [Tarantool-patches] [PATCH v4 17/16] replication: fix flaky election_qsync.test Serge Petrenko via Tarantool-patches 2021-07-26 23:43 ` [Tarantool-patches] [PATCH v4 00/16] forbid implicit limbo ownership transition Vladislav Shpilevoy via Tarantool-patches 2021-07-29 20:47 ` Sergey Petrenko 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=45a9ea6e-d72e-b2d7-c8b9-0454e6f3a2a3@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 v4 10/16] box: make promote always bump the term' \ /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