From: Serge Petrenko <sergepetrenko@tarantool.org> To: v.shpilevoy@tarantool.org, sergos@tarantool.org, gorcunov@gmail.com Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH 6/8] txn_limbo: fix instance id assignment Date: Tue, 9 Jun 2020 15:20:18 +0300 [thread overview] Message-ID: <461deb567c698a6222aa429aedcf85beba3256ad.1591701695.git.sergepetrenko@tarantool.org> (raw) In-Reply-To: <cover.1591701695.git.sergepetrenko@tarantool.org> When a txn_limbo is running on a replica, it holds changes from a remote master. Reflect it by assigning libmo instance id accordingly. Follow-up #4844 Part-of #4847 --- src/box/txn.c | 8 +++++++- src/box/txn_limbo.c | 8 +++++--- src/box/txn_limbo.h | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/box/txn.c b/src/box/txn.c index f30e20944..a65100b31 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -673,12 +673,18 @@ txn_commit(struct txn *txn) bool is_sync = txn_has_flag(txn, TXN_WAIT_ACK); if (is_sync) { + /* + * Remote rows, if any, come before local rows, so + * check for originating instance id here. + */ + uint32_t origin_id = req->rows[0]->replica_id; + /* * Append now. Before even WAL write is done. * After WAL write nothing should fail, even OOM * wouldn't be acceptable. */ - limbo_entry = txn_limbo_append(&txn_limbo, txn); + limbo_entry = txn_limbo_append(&txn_limbo, origin_id, txn); if (limbo_entry == NULL) { txn_rollback(txn); txn_free(txn); diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c index 47c1bd249..efb97a591 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -43,13 +43,15 @@ txn_limbo_create(struct txn_limbo *limbo) } struct txn_limbo_entry * -txn_limbo_append(struct txn_limbo *limbo, struct txn *txn) +txn_limbo_append(struct txn_limbo *limbo, uint32_t id, struct txn *txn) { assert(txn_has_flag(txn, TXN_WAIT_ACK)); - if (limbo->instance_id != instance_id) { + if (id == 0) + id = instance_id; + if (limbo->instance_id != id) { if (limbo->instance_id == REPLICA_ID_NIL || rlist_empty(&limbo->queue)) { - limbo->instance_id = instance_id; + limbo->instance_id = id; } else { diag_set(ClientError, ER_UNCOMMITTED_FOREIGN_SYNC_TXNS, limbo->instance_id); diff --git a/src/box/txn_limbo.h b/src/box/txn_limbo.h index 112fa8902..1ad1c567a 100644 --- a/src/box/txn_limbo.h +++ b/src/box/txn_limbo.h @@ -131,7 +131,7 @@ extern struct txn_limbo txn_limbo; * The limbo entry is allocated on the transaction's region. */ struct txn_limbo_entry * -txn_limbo_append(struct txn_limbo *limbo, struct txn *txn); +txn_limbo_append(struct txn_limbo *limbo, uint32_t id, struct txn *txn); /** Remove the entry from the limbo, mark as rolled back. */ void -- 2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2020-06-09 12:20 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-09 12:20 [Tarantool-patches] [PATCH 0/8] wait for lsn and confirm Serge Petrenko 2020-06-09 12:20 ` [Tarantool-patches] [PATCH 1/8] replication: introduce space.is_sync option Serge Petrenko 2020-06-10 23:51 ` Vladislav Shpilevoy 2020-06-18 22:27 ` Leonid Vasiliev 2020-06-21 16:24 ` Vladislav Shpilevoy 2020-06-09 12:20 ` [Tarantool-patches] [PATCH 2/8] replication: introduce replication_sync_quorum cfg Serge Petrenko 2020-06-10 23:51 ` Vladislav Shpilevoy 2020-06-15 23:05 ` Vladislav Shpilevoy 2020-06-18 22:54 ` Leonid Vasiliev 2020-06-19 17:45 ` Serge Petrenko 2020-06-21 16:25 ` Vladislav Shpilevoy 2020-06-09 12:20 ` [Tarantool-patches] [PATCH 3/8] txn: add TXN_WAIT_ACK flag Serge Petrenko 2020-06-18 23:12 ` Leonid Vasiliev 2020-06-21 16:25 ` Vladislav Shpilevoy 2020-06-22 9:44 ` Serge Petrenko 2020-06-23 22:13 ` Vladislav Shpilevoy 2020-06-09 12:20 ` [Tarantool-patches] [PATCH 4/8] replication: make sync transactions wait quorum Serge Petrenko 2020-06-10 23:51 ` Vladislav Shpilevoy 2020-06-11 14:57 ` Vladislav Shpilevoy 2020-06-15 23:05 ` Vladislav Shpilevoy 2020-06-19 12:39 ` Leonid Vasiliev 2020-06-25 21:48 ` Vladislav Shpilevoy 2020-06-09 12:20 ` [Tarantool-patches] [PATCH 5/8] txn_limbo: follow-up fixes Serge Petrenko 2020-06-10 23:51 ` Vladislav Shpilevoy 2020-06-11 8:46 ` Serge Petrenko 2020-06-11 13:01 ` Vladislav Shpilevoy 2020-06-09 12:20 ` Serge Petrenko [this message] 2020-06-10 23:51 ` [Tarantool-patches] [PATCH 6/8] txn_limbo: fix instance id assignment Vladislav Shpilevoy 2020-06-09 12:20 ` [Tarantool-patches] [PATCH 7/8] xrow: introduce CONFIRM entry Serge Petrenko 2020-06-19 15:18 ` Leonid Vasiliev 2020-06-22 10:14 ` Serge Petrenko 2020-06-23 8:33 ` Serge Petrenko 2020-06-09 12:20 ` [Tarantool-patches] [PATCH 8/8] replication: write and read CONFIRM entries Serge Petrenko 2020-06-10 23:51 ` Vladislav Shpilevoy 2020-06-11 8:56 ` Serge Petrenko 2020-06-11 13:04 ` Vladislav Shpilevoy 2020-06-11 14:57 ` Vladislav Shpilevoy 2020-06-15 23:05 ` Vladislav Shpilevoy 2020-06-18 11:32 ` Leonid Vasiliev 2020-06-18 21:49 ` Vladislav Shpilevoy 2020-06-19 17:48 ` Serge Petrenko 2020-06-19 17:50 ` Serge Petrenko 2020-06-23 8:35 ` Serge Petrenko 2020-06-20 15:06 ` Leonid Vasiliev 2020-06-22 10:34 ` Serge Petrenko 2020-06-23 8:34 ` Serge Petrenko 2020-06-25 22:04 ` Vladislav Shpilevoy 2020-06-25 22:31 ` Vladislav Shpilevoy 2020-06-26 10:58 ` Serge Petrenko 2020-06-09 12:53 ` [Tarantool-patches] [PATCH 0/2] A few fixes for building Cyrill Gorcunov 2020-06-09 12:53 ` [Tarantool-patches] [PATCH 1/2] box/applier: fix typo Cyrill Gorcunov 2020-06-10 9:18 ` Sergey Ostanevich 2020-06-09 12:53 ` [Tarantool-patches] [PATCH 2/2] box: use tnt_raise for quorum check Cyrill Gorcunov 2020-06-10 9:17 ` Sergey Ostanevich 2020-06-10 10:45 ` Serge Petrenko 2020-06-22 21:51 ` [Tarantool-patches] [PATCH 0/8] wait for lsn and confirm 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=461deb567c698a6222aa429aedcf85beba3256ad.1591701695.git.sergepetrenko@tarantool.org \ --to=sergepetrenko@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=sergos@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 6/8] txn_limbo: fix instance id assignment' \ /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