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 05/11] qsync: rename txn_limbo::instance_id to owner_id
Date: Fri, 13 Nov 2020 12:37:40 +0300 [thread overview]
Message-ID: <a6cfca83-b5cb-37ce-6139-35cfb74e1e75@tarantool.org> (raw)
In-Reply-To: <20201112195121.191366-6-gorcunov@gmail.com>
12.11.2020 22:51, Cyrill Gorcunov пишет:
> The instance_id name is too general, we use it
> in node's identification while limbo simply "belongs"
> to those who tracks current transactions queue.
>
> Lets rename it to owner_id to distinguish from global
> instance_id and better grepability.
>
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
> src/box/box.cc | 2 +-
> src/box/relay.cc | 2 +-
> src/box/txn.c | 2 +-
> src/box/txn_limbo.c | 34 +++++++++++++++++-----------------
> src/box/txn_limbo.h | 2 +-
> test/unit/snap_quorum_delay.cc | 2 +-
> 6 files changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/src/box/box.cc b/src/box/box.cc
> index 1f7dec362..9ff4545e1 100644
> --- a/src/box/box.cc
> +++ b/src/box/box.cc
> @@ -1014,7 +1014,7 @@ box_clear_synchro_queue(bool try_wait)
> {
> if (!is_box_configured || txn_limbo_is_empty(&txn_limbo))
> return;
> - uint32_t former_leader_id = txn_limbo.instance_id;
> + uint32_t former_leader_id = txn_limbo.owner_id;
> assert(former_leader_id != REPLICA_ID_NIL);
> if (former_leader_id == instance_id)
> return;
> diff --git a/src/box/relay.cc b/src/box/relay.cc
> index 1e77e0d9b..fa3dc3a75 100644
> --- a/src/box/relay.cc
> +++ b/src/box/relay.cc
> @@ -419,7 +419,7 @@ tx_status_update(struct cmsg *msg)
> * the single master in 100% so far). Other instances wait
> * for master's CONFIRM message instead.
> */
> - if (txn_limbo.instance_id == instance_id) {
> + if (txn_limbo.owner_id == instance_id) {
> txn_limbo_ack(&txn_limbo, status->relay->replica->id,
> vclock_get(&status->vclock, instance_id));
> }
> diff --git a/src/box/txn.c b/src/box/txn.c
> index 64f01f4e0..f8726026b 100644
> --- a/src/box/txn.c
> +++ b/src/box/txn.c
> @@ -931,7 +931,7 @@ txn_commit(struct txn *txn)
> txn_limbo_assign_local_lsn(&txn_limbo, limbo_entry,
> lsn);
> /* Local WAL write is a first 'ACK'. */
> - txn_limbo_ack(&txn_limbo, txn_limbo.instance_id, lsn);
> + txn_limbo_ack(&txn_limbo, txn_limbo.owner_id, lsn);
> }
> if (txn_limbo_wait_complete(&txn_limbo, limbo_entry) < 0)
> goto rollback;
> diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c
> index c94678885..2c35cd785 100644
> --- a/src/box/txn_limbo.c
> +++ b/src/box/txn_limbo.c
> @@ -40,7 +40,7 @@ static inline void
> txn_limbo_create(struct txn_limbo *limbo)
> {
> rlist_create(&limbo->queue);
> - limbo->instance_id = REPLICA_ID_NIL;
> + limbo->owner_id = REPLICA_ID_NIL;
> fiber_cond_create(&limbo->wait_cond);
> vclock_create(&limbo->vclock);
> limbo->confirmed_lsn = 0;
> @@ -72,14 +72,14 @@ txn_limbo_append(struct txn_limbo *limbo, uint32_t id, struct txn *txn)
> }
> if (id == 0)
> id = instance_id;
> - if (limbo->instance_id != id) {
> - if (limbo->instance_id == REPLICA_ID_NIL ||
> + if (limbo->owner_id != id) {
> + if (limbo->owner_id == REPLICA_ID_NIL ||
> rlist_empty(&limbo->queue)) {
> - limbo->instance_id = id;
> + limbo->owner_id = id;
> limbo->confirmed_lsn = 0;
> } else {
> diag_set(ClientError, ER_UNCOMMITTED_FOREIGN_SYNC_TXNS,
> - limbo->instance_id);
> + limbo->owner_id);
> return NULL;
> }
> }
> @@ -136,8 +136,8 @@ void
> txn_limbo_assign_remote_lsn(struct txn_limbo *limbo,
> struct txn_limbo_entry *entry, int64_t lsn)
> {
> - assert(limbo->instance_id != REPLICA_ID_NIL);
> - assert(limbo->instance_id != instance_id);
> + assert(limbo->owner_id != REPLICA_ID_NIL);
> + assert(limbo->owner_id != instance_id);
> assert(entry->lsn == -1);
> assert(lsn > 0);
> assert(txn_has_flag(entry->txn, TXN_WAIT_ACK));
> @@ -149,8 +149,8 @@ void
> txn_limbo_assign_local_lsn(struct txn_limbo *limbo,
> struct txn_limbo_entry *entry, int64_t lsn)
> {
> - assert(limbo->instance_id != REPLICA_ID_NIL);
> - assert(limbo->instance_id == instance_id);
> + assert(limbo->owner_id != REPLICA_ID_NIL);
> + assert(limbo->owner_id == instance_id);
> assert(entry->lsn == -1);
> assert(lsn > 0);
> assert(txn_has_flag(entry->txn, TXN_WAIT_ACK));
> @@ -175,7 +175,7 @@ void
> txn_limbo_assign_lsn(struct txn_limbo *limbo, struct txn_limbo_entry *entry,
> int64_t lsn)
> {
> - if (limbo->instance_id == instance_id)
> + if (limbo->owner_id == instance_id)
> txn_limbo_assign_local_lsn(limbo, entry, lsn);
> else
> txn_limbo_assign_remote_lsn(limbo, entry, lsn);
> @@ -293,7 +293,7 @@ txn_limbo_write_synchro(struct txn_limbo *limbo, uint32_t type, int64_t lsn)
>
> struct synchro_request req = {
> .type = type,
> - .replica_id = limbo->instance_id,
> + .replica_id = limbo->owner_id,
> .lsn = lsn,
> };
>
> @@ -348,7 +348,7 @@ txn_limbo_write_confirm(struct txn_limbo *limbo, int64_t lsn)
> static void
> txn_limbo_read_confirm(struct txn_limbo *limbo, int64_t lsn)
> {
> - assert(limbo->instance_id != REPLICA_ID_NIL);
> + assert(limbo->owner_id != REPLICA_ID_NIL);
> struct txn_limbo_entry *e, *tmp;
> rlist_foreach_entry_safe(e, &limbo->queue, in_queue, tmp) {
> /*
> @@ -409,7 +409,7 @@ txn_limbo_write_rollback(struct txn_limbo *limbo, int64_t lsn)
> static void
> txn_limbo_read_rollback(struct txn_limbo *limbo, int64_t lsn)
> {
> - assert(limbo->instance_id != REPLICA_ID_NIL);
> + assert(limbo->owner_id != REPLICA_ID_NIL);
> struct txn_limbo_entry *e, *tmp;
> struct txn_limbo_entry *last_rollback = NULL;
> rlist_foreach_entry_reverse(e, &limbo->queue, in_queue) {
> @@ -471,7 +471,7 @@ txn_limbo_ack(struct txn_limbo *limbo, uint32_t replica_id, int64_t lsn)
> */
> if (limbo->is_in_rollback)
> return;
> - assert(limbo->instance_id != REPLICA_ID_NIL);
> + assert(limbo->owner_id != REPLICA_ID_NIL);
> int64_t prev_lsn = vclock_get(&limbo->vclock, replica_id);
> /*
> * One of the reasons why can happen - the remote instance is not
> @@ -600,9 +600,9 @@ txn_limbo_wait_confirm(struct txn_limbo *limbo)
> int
> txn_limbo_process(struct txn_limbo *limbo, const struct synchro_request *req)
> {
> - if (req->replica_id != limbo->instance_id) {
> - diag_set(ClientError, ER_SYNC_MASTER_MISMATCH, req->replica_id,
> - limbo->instance_id);
> + if (req->replica_id != limbo->owner_id) {
> + diag_set(ClientError, ER_SYNC_MASTER_MISMATCH,
> + req->replica_id, limbo->owner_id);
> return -1;
> }
> switch (req->type) {
> diff --git a/src/box/txn_limbo.h b/src/box/txn_limbo.h
> index 3685164a9..c7e70ba64 100644
> --- a/src/box/txn_limbo.h
> +++ b/src/box/txn_limbo.h
> @@ -103,7 +103,7 @@ struct txn_limbo {
> * won't make sense - different nodes have own independent
> * LSNs in their vclock components.
> */
> - uint32_t instance_id;
> + uint32_t owner_id;
> /**
> * Condition to wait for completion. It is supposed to be
> * signaled when the synchro parameters change. Allowing
> diff --git a/test/unit/snap_quorum_delay.cc b/test/unit/snap_quorum_delay.cc
> index ad0563345..b9d4cc6c4 100644
> --- a/test/unit/snap_quorum_delay.cc
> +++ b/test/unit/snap_quorum_delay.cc
> @@ -131,7 +131,7 @@ txn_process_func(va_list ap)
> }
>
> txn_limbo_assign_local_lsn(&txn_limbo, entry, fake_lsn);
> - txn_limbo_ack(&txn_limbo, txn_limbo.instance_id, fake_lsn);
> + txn_limbo_ack(&txn_limbo, txn_limbo.owner_id, fake_lsn);
> txn_limbo_wait_complete(&txn_limbo, entry);
>
> switch (process_type) {
LGTM
--
Serge Petrenko
next prev parent reply other threads:[~2020-11-13 9:37 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 [this message]
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
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=a6cfca83-b5cb-37ce-6139-35cfb74e1e75@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 05/11] qsync: rename txn_limbo::instance_id to owner_id' \
/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