From: Serge Petrenko <sergepetrenko@tarantool.org> To: Cyrill Gorcunov <gorcunov@gmail.com>, tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 07/11] qsync: move limbo owner transition into separate helper Date: Fri, 13 Nov 2020 12:47:59 +0300 [thread overview] Message-ID: <025b90cb-64ae-8525-82d5-1fdc20ee3ff7@tarantool.org> (raw) In-Reply-To: <20201112195121.191366-8-gorcunov@gmail.com> 12.11.2020 22:51, Cyrill Gorcunov пишет: > This makes transition more explicit since owner_id persistence > while processing limbo queue is a key moment. Same time we > don't need to check for owner_id == REPLICA_ID_NIL since > it can't be nil with nonempty queue. > > Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> > --- > src/box/txn_limbo.c | 29 +++++++++++++++++++++-------- > 1 file changed, 21 insertions(+), 8 deletions(-) > > diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c > index 674dcad28..b58b9647d 100644 > --- a/src/box/txn_limbo.c > +++ b/src/box/txn_limbo.c > @@ -48,6 +48,24 @@ txn_limbo_create(struct txn_limbo *limbo) > limbo->is_in_rollback = false; > } > > +static bool > +txn_limbo_change_owner(struct txn_limbo *limbo, uint32_t owner_id) > +{ > + /* > + * Owner transition is allowed for empty txn queue only > + * since different nodes have own vclocks and LSNs won't > + * be ordered in limbo context. > + */ > + if (rlist_empty(&limbo->queue)) { > + limbo->owner_id = owner_id; > + limbo->confirmed_lsn = 0; > + return true; > + } > + > + diag_set(ClientError, ER_UNCOMMITTED_FOREIGN_SYNC_TXNS, limbo->owner_id); > + return false; > +} > + AFAIK we use `return 0/-1` for such functions. bool is only used for something that really returns true or false, like `field_mp_type_is_compatible()`. Other than that the patch looks good. > struct txn_limbo_entry * > txn_limbo_append(struct txn_limbo *limbo, uint32_t owner_id, struct txn *txn) > { > @@ -77,17 +95,12 @@ txn_limbo_append(struct txn_limbo *limbo, uint32_t owner_id, struct txn *txn) > */ > owner_id = instance_id; > } > + > if (limbo->owner_id != owner_id) { > - if (limbo->owner_id == REPLICA_ID_NIL || > - rlist_empty(&limbo->queue)) { > - limbo->owner_id = owner_id; > - limbo->confirmed_lsn = 0; > - } else { > - diag_set(ClientError, ER_UNCOMMITTED_FOREIGN_SYNC_TXNS, > - limbo->owner_id); > + if (!txn_limbo_change_owner(limbo, owner_id)) > return NULL; > - } > } > + > size_t size; > struct txn_limbo_entry *e = region_alloc_object(&txn->region, > typeof(*e), &size); -- Serge Petrenko
next prev parent reply other threads:[~2020-11-13 9:48 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-12 19:51 [Tarantool-patches] [PATCH 00/11] qsync: code refactoring Cyrill Gorcunov 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 01/11] build: add more ignore paths for tags target Cyrill Gorcunov 2020-11-16 13:09 ` Cyrill Gorcunov 2020-11-20 23:55 ` Vladislav Shpilevoy 2020-11-21 12:09 ` Cyrill Gorcunov 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 02/11] vclock: vclock_get - drop misleading masking Cyrill Gorcunov 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 03/11] vclock: vclock_inc -- add assert() to catch overflow Cyrill Gorcunov 2020-11-13 9:30 ` Serge Petrenko 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 04/11] txn: txn_commit_async -- drop redundant variable Cyrill Gorcunov 2020-11-13 9:31 ` Serge Petrenko 2020-11-20 23:55 ` Vladislav Shpilevoy 2020-11-21 12:30 ` Cyrill Gorcunov 2020-11-21 13:29 ` Vladislav Shpilevoy 2020-11-21 16:14 ` Cyrill Gorcunov 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 05/11] qsync: rename txn_limbo::instance_id to owner_id Cyrill Gorcunov 2020-11-13 9:37 ` Serge Petrenko 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 06/11] qsync: txn_limbo_append -- use owner_id in argument name Cyrill Gorcunov 2020-11-13 9:43 ` Serge Petrenko 2020-11-13 10:11 ` Cyrill Gorcunov 2020-11-20 23:55 ` Vladislav Shpilevoy 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 07/11] qsync: move limbo owner transition into separate helper Cyrill Gorcunov 2020-11-13 9:47 ` Serge Petrenko [this message] 2020-11-13 10:12 ` Cyrill Gorcunov 2020-11-20 23:55 ` Vladislav Shpilevoy 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 08/11] qsync: txn_limbo_wait_confirm -- refactor code a bit Cyrill Gorcunov 2020-11-13 9:56 ` Serge Petrenko 2020-11-20 23:55 ` Vladislav Shpilevoy 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 09/11] qsync: drop redundant type convention Cyrill Gorcunov 2020-11-13 10:11 ` Serge Petrenko 2020-11-13 10:13 ` Cyrill Gorcunov 2020-11-13 10:19 ` Serge Petrenko 2020-11-20 23:55 ` Vladislav Shpilevoy 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 10/11] relay: use verbose names for fibers Cyrill Gorcunov 2020-11-13 10:17 ` Serge Petrenko 2020-11-13 10:28 ` Cyrill Gorcunov 2020-11-20 23:55 ` Vladislav Shpilevoy 2020-11-12 19:51 ` [Tarantool-patches] [PATCH 11/11] raft: drop redundant argument Cyrill Gorcunov 2020-11-13 10:18 ` Serge Petrenko 2020-11-20 23:54 ` [Tarantool-patches] [PATCH 00/11] qsync: code refactoring Vladislav Shpilevoy 2020-11-24 23:24 ` Vladislav Shpilevoy 2020-11-23 23:26 ` Vladislav Shpilevoy 2020-11-24 6:52 ` Cyrill Gorcunov 2020-11-24 21:41 ` Alexander V. Tikhonov
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=025b90cb-64ae-8525-82d5-1fdc20ee3ff7@tarantool.org \ --to=sergepetrenko@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 07/11] qsync: move limbo owner transition into separate helper' \ /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