From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 12/14] box/txn: do not use journal_write_async under the hood Date: Wed, 19 Feb 2020 21:37:11 +0300 [thread overview] Message-ID: <20200219183713.17646-13-gorcunov@gmail.com> (raw) In-Reply-To: <20200219183713.17646-1-gorcunov@gmail.com> While there is some code duplication (maybe we should make merge this into txn_prepare?) the idea is to unweave journal_write_async from txn_commit which is synchronous. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/txn.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/box/txn.c b/src/box/txn.c index a95c28431..38241c066 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -605,8 +605,27 @@ txn_commit(struct txn *txn) { txn->fiber = fiber(); - if (txn_commit_async(txn) != 0) + if (txn_prepare(txn) != 0) { + txn_rollback(txn); + return -1; + } + + if (txn_complete_nop(txn)) + return 0; + + struct journal_entry *req = txn_entry_new(txn); + if (req == NULL) { + txn_rollback(txn); + return -1; + } + + /* Send the entry to the journal. */ + if (journal_write_async(req) < 0) { + diag_set(ClientError, ER_WAL_IO); + diag_log(); return -1; + } + /* * In case of non-yielding journal the transaction could already * be done and there is nothing to wait in such cases. -- 2.20.1
next prev parent reply other threads:[~2020-02-19 18:39 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-19 18:36 [Tarantool-patches] [PATCH 00/14] rework async and sync transactions Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 01/14] box/txn: fix void args mess Cyrill Gorcunov 2020-02-20 14:10 ` Nikita Pettik 2020-02-20 14:16 ` Cyrill Gorcunov 2020-02-20 14:34 ` Nikita Pettik 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 02/14] box/journal: use plain int for return value Cyrill Gorcunov 2020-02-20 14:11 ` Nikita Pettik 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 03/14] box/journal: sanitize completion naming Cyrill Gorcunov 2020-02-20 14:12 ` Nikita Pettik 2020-02-20 14:15 ` Nikita Pettik 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 04/14] box/txn: rename txn_entry_done_cb to txn_entry_complete_cb Cyrill Gorcunov 2020-02-20 14:15 ` Nikita Pettik 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 05/14] box/txn: rename txn_write_to_wal to txn_write_to_wal_async Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 06/14] box/journal: supersede journal_write with journal_write_async Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 07/14] box/txn: rename txn_write to txn_commit_async Cyrill Gorcunov 2020-02-22 20:28 ` Georgy Kirichenko 2020-02-22 21:00 ` Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 08/14] box/txn: move setup of transaction start time to txn_prepare Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 09/14] box/txn: make txn nop processing a separate routine Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 10/14] box/txn: move journal entry allocation into " Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 11/14] box/txn: merge txn_write_to_wal_async to txn_commit_async Cyrill Gorcunov 2020-02-19 18:37 ` Cyrill Gorcunov [this message] 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 13/14] box/journal: introduce journal_write Cyrill Gorcunov 2020-02-19 18:37 ` [Tarantool-patches] [PATCH 14/14] box/txn: use journal_write in txn_commit Cyrill Gorcunov 2020-02-19 19:09 ` Konstantin Osipov 2020-02-19 20:01 ` Cyrill Gorcunov
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=20200219183713.17646-13-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 12/14] box/txn: do not use journal_write_async under the hood' \ /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