From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 06/10] box/txn: unweave txn_commit from txn_commit_async Date: Thu, 5 Mar 2020 15:29:39 +0300 [thread overview] Message-ID: <20200305122943.7324-7-gorcunov@gmail.com> (raw) In-Reply-To: <20200305122943.7324-1-gorcunov@gmail.com> We gonna divergence sync and async code flow thus lets make txn_commit to not use txn_commit_async. Fixes #4031 Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/txn.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/box/txn.c b/src/box/txn.c index bee43a066..1c0143703 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -604,10 +604,24 @@ txn_commit_async(struct txn *txn) int txn_commit(struct txn *txn) { + int res = -1; + txn->fiber = fiber(); - if (txn_commit_async(txn) != 0) + if (txn_prepare(txn) != 0) { + txn_rollback(txn); + goto out; + } + + if (txn_commit_nop(txn)) { + res = 0; + goto out; + } + + fiber_set_txn(fiber(), NULL); + if (txn_write_to_wal(txn) != 0) return -1; + /* * In case of non-yielding journal the transaction could already * be done and there is nothing to wait in such cases. @@ -617,10 +631,11 @@ txn_commit(struct txn *txn) fiber_yield(); fiber_set_cancellable(cancellable); } - int res = txn->signature >= 0 ? 0 : -1; + res = txn->signature >= 0 ? 0 : -1; if (res != 0) diag_set(ClientError, ER_WAL_IO); +out: /* Synchronous transactions are freed by the calling fiber. */ txn_free(txn); return res; -- 2.20.1
next prev parent reply other threads:[~2020-03-05 12:31 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-05 12:29 [Tarantool-patches] [PATCH 00/10] box/journal: redesign sync and async writes Cyrill Gorcunov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 01/10] box: recovery_journal_create -- set journal here Cyrill Gorcunov 2020-03-06 21:27 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 02/10] box/txn: move fiber_set_txn to header Cyrill Gorcunov 2020-03-06 21:27 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 03/10] box/txn: rename txn_write to txn_commit_async Cyrill Gorcunov 2020-03-06 21:28 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 04/10] box/txn: move setup of txn start to txn_prepare Cyrill Gorcunov 2020-03-06 21:30 ` Konstantin Osipov 2020-03-18 12:38 ` Cyrill Gorcunov 2020-03-18 13:58 ` Konstantin Osipov 2020-03-18 14:09 ` Cyrill Gorcunov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 05/10] box/txn: add txn_commit_nop helper Cyrill Gorcunov 2020-03-06 21:30 ` Konstantin Osipov 2020-03-05 12:29 ` Cyrill Gorcunov [this message] 2020-03-06 21:33 ` [Tarantool-patches] [PATCH 06/10] box/txn: unweave txn_commit from txn_commit_async Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 07/10] box/txn: clear fiber storage right before journal write Cyrill Gorcunov 2020-03-06 21:34 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 08/10] box/txn: move journal allocation into separate routine Cyrill Gorcunov 2020-03-06 21:35 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 09/10] box/journal: journal_entry_new -- drop setting up callbacks Cyrill Gorcunov 2020-03-06 21:37 ` Konstantin Osipov 2020-03-06 21:41 ` Cyrill Gorcunov 2020-03-06 21:51 ` Konstantin Osipov 2020-03-06 21:57 ` Cyrill Gorcunov 2020-03-06 22:04 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 10/10] box/journal: redesign sync and async writes Cyrill Gorcunov 2020-03-06 21:48 ` Konstantin Osipov
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=20200305122943.7324-7-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 06/10] box/txn: unweave txn_commit from txn_commit_async' \ /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