From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH 08/11] qsync: txn_limbo_wait_confirm -- refactor code a bit Date: Thu, 12 Nov 2020 22:51:18 +0300 [thread overview] Message-ID: <20201112195121.191366-9-gorcunov@gmail.com> (raw) In-Reply-To: <20201112195121.191366-1-gorcunov@gmail.com> - no need for useless comments which describe what we're doing, it is obvious from the code, instead put comment explaining "why" we're doing these things; - use designated assignments for cwp, this is a rule of thumb for C where structure need to be initialized from the scratch; - reorder triggers declaration mess, without empty lines which are ordering context they are simply unreadable; - try to not use goto/jumps when possible (gotos are suitable as a common error entry point but here we can handle everything inside cycle itself). Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/txn_limbo.c | 54 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c index b58b9647d..cf6122360 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -573,20 +573,25 @@ txn_limbo_wait_confirm(struct txn_limbo *limbo) if (txn_limbo_is_empty(limbo)) return 0; - /* initialization of a waitpoint. */ - struct confirm_waitpoint cwp; - cwp.caller = fiber(); - cwp.is_confirm = false; - cwp.is_rollback = false; - - /* Set triggers for the last limbo transaction. */ - struct trigger on_complete; + struct confirm_waitpoint cwp = { + .caller = fiber(), + .is_confirm = false, + .is_rollback = false, + }; + + /* + * Since we're waiting for all sync transactions to complete, + * we need the last entry from the limbo. + */ + struct txn_limbo_entry *tle = txn_limbo_last_entry(limbo); + + struct trigger on_complete, on_rollback; trigger_create(&on_complete, txn_commit_cb, &cwp, NULL); - struct trigger on_rollback; trigger_create(&on_rollback, txn_rollback_cb, &cwp, NULL); - struct txn_limbo_entry *tle = txn_limbo_last_entry(limbo); + txn_on_commit(tle->txn, &on_complete); txn_on_rollback(tle->txn, &on_rollback); + double start_time = fiber_clock(); while (true) { double deadline = start_time + replication_synchro_timeout; @@ -594,25 +599,18 @@ txn_limbo_wait_confirm(struct txn_limbo *limbo) double timeout = deadline - fiber_clock(); int rc = fiber_cond_wait_timeout(&limbo->wait_cond, timeout); fiber_set_cancellable(cancellable); - if (cwp.is_confirm || cwp.is_rollback) - goto complete; - if (rc != 0) - goto timed_out; - } -timed_out: - /* Clear the triggers if the timeout has been reached. */ - trigger_clear(&on_complete); - trigger_clear(&on_rollback); - diag_set(ClientError, ER_SYNC_QUORUM_TIMEOUT); - return -1; - -complete: - if (!cwp.is_confirm) { - /* The transaction has been rolled back. */ - diag_set(ClientError, ER_SYNC_ROLLBACK); - return -1; + if (cwp.is_confirm) { + return 0; + } else if (cwp.is_rollback) { + diag_set(ClientError, ER_SYNC_ROLLBACK); + return -1; + } else if (rc != 0) { + trigger_clear(&on_complete); + trigger_clear(&on_rollback); + diag_set(ClientError, ER_SYNC_QUORUM_TIMEOUT); + return -1; + } } - return 0; } int -- 2.26.2
next prev parent reply other threads:[~2020-11-12 19:53 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 2020-11-13 10:12 ` Cyrill Gorcunov 2020-11-20 23:55 ` Vladislav Shpilevoy 2020-11-12 19:51 ` Cyrill Gorcunov [this message] 2020-11-13 9:56 ` [Tarantool-patches] [PATCH 08/11] qsync: txn_limbo_wait_confirm -- refactor code a bit 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=20201112195121.191366-9-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 08/11] qsync: txn_limbo_wait_confirm -- refactor code a bit' \ /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