From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Cyrill Gorcunov <gorcunov@gmail.com>, tml <tarantool-patches@dev.tarantool.org> Subject: Re: [Tarantool-patches] [PATCH 08/17] recovery: recovery_follow_local -- don't throw exception Date: Sun, 3 May 2020 20:46:08 +0200 [thread overview] Message-ID: <bc344884-0254-d71a-1a6a-dc86b0989c3b@tarantool.org> (raw) In-Reply-To: <20200428161137.20536-9-gorcunov@gmail.com> Thanks for the patch! See 2 comments below. > diff --git a/src/box/box.cc b/src/box/box.cc > index ff095d767..7551ca753 100644 > --- a/src/box/box.cc > +++ b/src/box/box.cc > @@ -2292,8 +2292,9 @@ local_recovery(const struct tt_uuid *instance_uuid, > if (wal_dir_lock < 0) { > title("hot_standby"); > say_info("Entering hot standby mode"); > - recovery_follow_local(recovery, &wal_stream.base, "hot_standby", > - cfg_getd("wal_dir_rescan_delay")); > + if (recovery_follow_local(recovery, &wal_stream.base, "hot_standby", > + cfg_getd("wal_dir_rescan_delay")) != 0) 1. This becomes out of 80 symbols now. Lets better wrap some arguments. > + diag_raise(); > while (true) { > if (path_lock(cfg_gets("wal_dir"), &wal_dir_lock)) { > recovery_stop_local(recovery); > diff --git a/src/box/recovery.cc b/src/box/recovery.cc > index 996966a77..24036b7c1 100644 > --- a/src/box/recovery.cc > +++ b/src/box/recovery.cc > @@ -568,9 +568,12 @@ recovery_follow_local(struct recovery *r, struct xstream *stream, > * xlog. > */ > assert(r->watcher == NULL); > - r->watcher = fiber_new_xc(name, hot_standby_f); > + r->watcher = fiber_new(name, hot_standby_f); > + if (!r->watcher) 2. Lets better follow our code style and use explicit '== NULL'. It looks more understandable, is consistent (it is compared with NULL literally 2 lines above, and in other places in the other patches of your patchset), and gives a hint on what type the variable in condition has. > + return -1; > fiber_set_joinable(r->watcher, true); > fiber_start(r->watcher, r, stream, wal_dir_rescan_delay); > + return 0; > }
next prev parent reply other threads:[~2020-05-03 18:46 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-28 16:11 [Tarantool-patches] [PATCH 00/17] recovery: move from cxx to c code Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 01/17] recovery: do not call recovery_stop_local inside recovery_delete Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 02/17] recovery: convert WalSubscription class to structure Cyrill Gorcunov 2020-05-03 18:42 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 03/17] recovery: recovery_close_log -- don't throw exception Cyrill Gorcunov 2020-05-03 18:43 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 04/17] recovery: recovery_open_log " Cyrill Gorcunov 2020-05-03 18:43 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 05/17] recovery: recover_xlog " Cyrill Gorcunov 2020-05-03 18:44 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 06/17] recovery: recover_remaining_wals " Cyrill Gorcunov 2020-05-03 18:44 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 07/17] recovery: hot_standby_f " Cyrill Gorcunov 2020-05-03 18:45 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 08/17] recovery: recovery_follow_local " Cyrill Gorcunov 2020-05-03 18:46 ` Vladislav Shpilevoy [this message] 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 09/17] recovery: recovery_new " Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 10/17] recovery: recovery_scan " Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 11/17] recovery: recovery_finalize " Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 12/17] recovery: recovery_stop_local " Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 13/17] recovery: cxx to c transition Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 14/17] recovery: drop redundant type_XlogGapError Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 15/17] recovery: provide throwable wrappers Cyrill Gorcunov 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 16/17] box: use _xc helpers of recovery code Cyrill Gorcunov 2020-05-03 18:47 ` Vladislav Shpilevoy 2020-04-28 16:11 ` [Tarantool-patches] [PATCH 17/17] relay: use _xc recovery helpers Cyrill Gorcunov 2020-04-28 16:24 ` [Tarantool-patches] [PATCH 01/17] recovery: do not call recovery_stop_local inside recovery_delete 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=bc344884-0254-d71a-1a6a-dc86b0989c3b@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 08/17] recovery: recovery_follow_local -- don'\''t throw exception' \ /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