From: Konstantin Osipov <kostja.osipov@gmail.com> To: Georgy Kirichenko <georgy@tarantool.org>, sergepetrenko@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v4 01/11] recovery: do not call recovery_stop_local inside recovery_delete Date: Thu, 19 Mar 2020 10:55:19 +0300 [thread overview] Message-ID: <20200319075519.GB3227@atlas> (raw) In-Reply-To: <49f33a8165d9de27ed5b852027b5093556fbb06a.1581500169.git.georgy@tarantool.org> Hello, * Georgy Kirichenko <georgy@tarantool.org> [20/02/12 13:09]: > Recovery stop local raises an exception in case of an recovery error > so it is not safe to stop recovery inside recovery delete and guard > inside local_recovery. So call recovery_stop_local manually. I suggest you try/catch the exception in recovery_delete instead, or add a flag to recovery_stop_local to nothrow, or move diag_raise() out of recovery_stop_local() and make sure recovery_stop_local() returns 0, -1 It would be nice to explain in the changeset comment what is the exact event chain that leads to an exception from recovery_stop_local() - and even better - to add a test. > Part of #980 > --- > src/box/box.cc | 4 +++- > src/box/recovery.cc | 2 +- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/src/box/box.cc b/src/box/box.cc > index 1b2b27d61..68038df18 100644 > --- a/src/box/box.cc > +++ b/src/box/box.cc > @@ -2238,8 +2238,10 @@ local_recovery(const struct tt_uuid *instance_uuid, > recovery_follow_local(recovery, &wal_stream.base, "hot_standby", > cfg_getd("wal_dir_rescan_delay")); > while (true) { > - if (path_lock(cfg_gets("wal_dir"), &wal_dir_lock)) > + if (path_lock(cfg_gets("wal_dir"), &wal_dir_lock)) { > + recovery_stop_local(recovery); > diag_raise(); > + } > if (wal_dir_lock >= 0) > break; > fiber_sleep(0.1); > diff --git a/src/box/recovery.cc b/src/box/recovery.cc > index 64aa467b1..a1ac2d967 100644 > --- a/src/box/recovery.cc > +++ b/src/box/recovery.cc > @@ -216,7 +216,7 @@ gap_error: > void > recovery_delete(struct recovery *r) > { > - recovery_stop_local(r); > + assert(r->watcher == NULL); > > trigger_destroy(&r->on_close_log); > xdir_destroy(&r->wal_dir); > -- > 2.25.0 -- Konstantin Osipov, Moscow, Russia
next prev parent reply other threads:[~2020-03-19 7:55 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-12 9:39 [Tarantool-patches] [PATCH v4 00/11] Replication from memory Georgy Kirichenko 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 01/11] recovery: do not call recovery_stop_local inside recovery_delete Georgy Kirichenko 2020-03-19 7:55 ` Konstantin Osipov [this message] 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 02/11] recovery: do not throw an error Georgy Kirichenko 2020-03-19 7:56 ` Konstantin Osipov 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 03/11] coio: do not allow parallel usage of coio Georgy Kirichenko 2020-03-19 18:09 ` Konstantin Osipov 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 04/11] coio: do not throw an error, minor refactoring Georgy Kirichenko 2020-03-23 6:59 ` Konstantin Osipov 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 05/11] xstream: get rid of an exception Georgy Kirichenko 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 06/11] wal: extract log write batch into a separate routine Georgy Kirichenko 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 07/11] wal: matrix clock structure Georgy Kirichenko 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 08/11] wal: track relay vclock and collect logs in wal thread Georgy Kirichenko 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 09/11] wal: xrow memory buffer and cursor Georgy Kirichenko 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 10/11] wal: use a xrow buffer object for entry encoding Georgy Kirichenko 2020-02-12 9:39 ` [Tarantool-patches] [PATCH v4 11/11] replication: use wal memory buffer to fetch rows Georgy Kirichenko
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=20200319075519.GB3227@atlas \ --to=kostja.osipov@gmail.com \ --cc=georgy@tarantool.org \ --cc=sergepetrenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v4 01/11] recovery: do not call recovery_stop_local inside recovery_delete' \ /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