From: Serge Petrenko <sergepetrenko@tarantool.org>
To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>,
tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v2 14/19] applier: remove writer_cond
Date: Thu, 2 Jul 2020 12:13:25 +0300 [thread overview]
Message-ID: <bdc5e194-23d8-a458-6c92-0869e8b3d244@tarantool.org> (raw)
In-Reply-To: <4a02e7dcec2cdddc5c45d5eca3f99d7f618af1d4.1593472477.git.v.shpilevoy@tarantool.org>
30.06.2020 02:15, Vladislav Shpilevoy пишет:
> Writer condition variable was used by the writer fiber to be woken
> up when it is time to send a heartbeat or an ACK.
>
> However it is not really needed, because writer fiber pointer is
> always available in the same structure as writer_cond, and can be
> used to call fiber_wakeup() directly.
>
> Note, fiber_cond_signal() is basically the same fiber_wakeup().
>
> The patch is not just refactoring for nothing. It is a
> prerequisite for #5100. In this issue it will be needed to wakeup
> the applier's writer fiber directly on each WAL write from txn.c
> module. So the writer_cond won't be available. The only usable
> thing will be txn->fiber, which will be set to applier's writer.
>
> Part of #5100
> ---
> src/box/applier.cc | 11 ++++-------
> src/box/applier.h | 2 --
> 2 files changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/src/box/applier.cc b/src/box/applier.cc
> index fbb452dc0..635a9849c 100644
> --- a/src/box/applier.cc
> +++ b/src/box/applier.cc
> @@ -155,11 +155,9 @@ applier_writer_f(va_list ap)
> * replication_timeout seconds any more.
> */
> if (applier->version_id >= version_id(1, 7, 7))
> - fiber_cond_wait_timeout(&applier->writer_cond,
> - TIMEOUT_INFINITY);
> + fiber_yield_timeout(TIMEOUT_INFINITY);
> else
> - fiber_cond_wait_timeout(&applier->writer_cond,
> - replication_timeout);
> + fiber_yield_timeout(replication_timeout);
> /*
> * A writer fiber is going to be awaken after a commit or
> * a heartbeat message. So this is an appropriate place to
> @@ -928,7 +926,7 @@ applier_on_commit(struct trigger *trigger, void *event)
> {
> (void) event;
> struct applier *applier = (struct applier *)trigger->data;
> - fiber_cond_signal(&applier->writer_cond);
> + fiber_wakeup(applier->writer);
> return 0;
> }
>
> @@ -1093,7 +1091,7 @@ applier_subscribe(struct applier *applier)
> */
> if (stailq_first_entry(&rows, struct applier_tx_row,
> next)->row.lsn == 0)
> - fiber_cond_signal(&applier->writer_cond);
> + fiber_wakeup(applier->writer);
> else if (applier_apply_tx(&rows) != 0)
> diag_raise();
>
> @@ -1289,7 +1287,6 @@ applier_new(const char *uri)
> applier->last_row_time = ev_monotonic_now(loop());
> rlist_create(&applier->on_state);
> fiber_cond_create(&applier->resume_cond);
> - fiber_cond_create(&applier->writer_cond);
> diag_create(&applier->diag);
>
> return applier;
> diff --git a/src/box/applier.h b/src/box/applier.h
> index c9fdc2955..4f8bee84e 100644
> --- a/src/box/applier.h
> +++ b/src/box/applier.h
> @@ -78,8 +78,6 @@ struct applier {
> struct fiber *reader;
> /** Background fiber to reply with vclock */
> struct fiber *writer;
> - /** Writer cond. */
> - struct fiber_cond writer_cond;
> /** Finite-state machine */
> enum applier_state state;
> /** Local time of this replica when the last row has been received */
Thanks for the patch! LGTM.
--
Serge Petrenko
next prev parent reply other threads:[~2020-07-02 9:13 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1593723973.git.sergeyb@tarantool.org>
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 00/19] Sync replication Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 01/19] replication: introduce space.is_sync option Vladislav Shpilevoy
2020-06-30 23:00 ` Vladislav Shpilevoy
2020-07-01 15:55 ` Sergey Ostanevich
2020-07-01 23:46 ` Vladislav Shpilevoy
2020-07-02 8:25 ` Serge Petrenko
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 10/19] txn_limbo: add ROLLBACK processing Vladislav Shpilevoy
2020-07-05 15:29 ` Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 11/19] box: rework local_recovery to use async txn_commit Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 12/19] replication: support ROLLBACK and CONFIRM during recovery Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 13/19] replication: add test for synchro CONFIRM/ROLLBACK Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 14/19] applier: remove writer_cond Vladislav Shpilevoy
2020-07-02 9:13 ` Serge Petrenko [this message]
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 15/19] applier: send heartbeat not only on commit, but on any write Vladislav Shpilevoy
2020-07-01 23:55 ` Vladislav Shpilevoy
2020-07-03 12:23 ` Serge Petrenko
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 16/19] txn_limbo: add diag_set in txn_limbo_wait_confirm Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 17/19] replication: delay initial join until confirmation Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 18/19] replication: only send confirmed data during final join Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 19/19] replication: block async transactions when not empty limbo Vladislav Shpilevoy
2020-07-01 17:12 ` Sergey Ostanevich
2020-07-01 23:47 ` Vladislav Shpilevoy
2020-07-03 12:28 ` Serge Petrenko
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 02/19] replication: introduce replication_synchro_* cfg options Vladislav Shpilevoy
2020-07-01 16:05 ` Sergey Ostanevich
2020-07-01 23:46 ` Vladislav Shpilevoy
2020-07-02 8:29 ` Serge Petrenko
2020-07-02 23:36 ` Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 03/19] txn: add TXN_WAIT_ACK flag Vladislav Shpilevoy
2020-07-01 17:14 ` Sergey Ostanevich
2020-07-01 23:46 ` Vladislav Shpilevoy
2020-07-02 8:30 ` Serge Petrenko
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 04/19] replication: make sync transactions wait quorum Vladislav Shpilevoy
2020-06-30 23:00 ` Vladislav Shpilevoy
2020-07-02 8:48 ` Serge Petrenko
2020-07-03 21:16 ` Vladislav Shpilevoy
2020-07-05 16:05 ` Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 05/19] xrow: introduce CONFIRM and ROLLBACK entries Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 06/19] txn: introduce various reasons for txn rollback Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 07/19] replication: write and read CONFIRM entries Vladislav Shpilevoy
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 08/19] replication: add support of qsync to the snapshot machinery Vladislav Shpilevoy
2020-07-02 8:52 ` Serge Petrenko
2020-07-08 11:43 ` Leonid Vasiliev
2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 09/19] txn_limbo: add timeout when waiting for acks Vladislav Shpilevoy
2020-06-29 23:22 ` [Tarantool-patches] [PATCH v2 00/19] Sync replication Vladislav Shpilevoy
2020-06-30 23:00 ` [Tarantool-patches] [PATCH v2 20/19] replication: add test for quorum 1 Vladislav Shpilevoy
2020-07-03 12:32 ` Serge Petrenko
2020-07-02 21:13 ` [Tarantool-patches] [PATCH 1/4] replication: regression test on gh-5119 [not fixed] sergeyb
2020-07-02 21:13 ` [Tarantool-patches] [PATCH 2/4] replication: add advanced tests for sync replication sergeyb
2020-07-02 22:46 ` Sergey Bronnikov
2020-07-02 23:20 ` Vladislav Shpilevoy
2020-07-06 12:30 ` Sergey Bronnikov
2020-07-06 23:31 ` Vladislav Shpilevoy
2020-07-07 12:12 ` Sergey Bronnikov
2020-07-07 20:57 ` Vladislav Shpilevoy
2020-07-08 12:07 ` Sergey Bronnikov
2020-07-08 22:13 ` Vladislav Shpilevoy
2020-07-09 9:39 ` Sergey Bronnikov
2020-07-02 21:13 ` [Tarantool-patches] [PATCH 3/4] replication: add tests for sync replication with anon replica sergeyb
2020-07-06 23:31 ` Vladislav Shpilevoy
2020-07-02 21:13 ` [Tarantool-patches] [PATCH 4/4] replication: add tests for sync replication with snapshots sergeyb
2020-07-02 22:46 ` Sergey Bronnikov
2020-07-02 23:20 ` Vladislav Shpilevoy
2020-07-06 23:31 ` Vladislav Shpilevoy
2020-07-07 16:00 ` Sergey Bronnikov
2020-07-06 23:31 ` [Tarantool-patches] [PATCH] Add new error injection constant ERRINJ_SYNC_TIMEOUT Vladislav Shpilevoy
2020-07-10 0:50 ` [Tarantool-patches] [PATCH v2 00/19] Sync replication Vladislav Shpilevoy
2020-07-10 7:40 ` Kirill Yukhin
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=bdc5e194-23d8-a458-6c92-0869e8b3d244@tarantool.org \
--to=sergepetrenko@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2 14/19] applier: remove writer_cond' \
/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