From: Nikita Pettik <korablev@tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 2/2] vinyl: drop wasted runs in case range recovery fails Date: Thu, 7 May 2020 22:36:25 +0000 [thread overview] Message-ID: <20200507223625.GB13970@tarantool.org> (raw) In-Reply-To: <5a697151-e6fc-c567-ccf6-8d02a1df340e@tarantool.org> On 07 May 23:47, Vladislav Shpilevoy wrote: > Thanks for the explanation and the new commit message! > > >>> diff --git a/src/box/vy_lsm.c b/src/box/vy_lsm.c > >>> index 3d3f41b7a..81b011c69 100644 > >>> --- a/src/box/vy_lsm.c > >>> +++ b/src/box/vy_lsm.c > >>> @@ -604,9 +604,17 @@ vy_lsm_recover(struct vy_lsm *lsm, struct vy_recovery *recovery, > >>> * of each recovered run. We need to drop the extra > >>> * references once we are done. > >>> */ > >>> - struct vy_run *run; > >>> - rlist_foreach_entry(run, &lsm->runs, in_lsm) { > >>> - assert(run->refs > 1); > >>> + struct vy_run *run, *next_run; > >>> + rlist_foreach_entry_safe(run, &lsm->runs, in_lsm, next_run) { > >>> + /* > >>> + * In case vy_lsm_recover_range() failed, slices > >>> + * are already deleted and runs are unreffed. So > >>> + * we have nothing to do but finish run clean-up. > >>> + */ > >>> + if (run->refs == 1) { > >> > >> Reference counter looks like not a good information channel. > >> Could you use run->fd to check whether the run was really recovered? > >> vy_run_recover() leaves it -1, when fails. > >> > >> Otherwise this won't work the second when we will ref the run anywhere > >> else. > > > > Firstly, lsm at this point is not restored, ergo it is not functional > > and run can't be refed somewehere else - it's life span is clearly > > defined. Secondly, the problem is not in the last run (which failed to > > recover) but in those which are already recovered at the moment. > > Recovered runs feature valid fds. Finally, slice recover may fail > > not only in vy_run_recover(), but also due to oom, broken vylog etc. > > All these scenarios lead to the same situation. > > Yeah, fair. Then what about run->slice_count? If it is zero, then it > is not kept by any slice. So we can look at slice_count == 0 and > assert ref == 1. Or look at ref == 1, and assert slice_count == 0. > Whatever. Will that work? diff --git a/src/box/vy_lsm.c b/src/box/vy_lsm.c index 7755f04f0..005dde3b2 100644 --- a/src/box/vy_lsm.c +++ b/src/box/vy_lsm.c @@ -613,6 +613,7 @@ vy_lsm_recover(struct vy_lsm *lsm, struct vy_recovery *recovery, */ if (run->refs == 1) { assert(rc != 0); + assert(run->slice_count == 0); vy_lsm_remove_run(lsm, run); } vy_run_unref(run);
next prev parent reply other threads:[~2020-05-07 22:36 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-30 19:27 [Tarantool-patches] [PATCH 0/2] Fix crash in case of lack of FDs during recovery Nikita Pettik 2020-04-30 19:27 ` [Tarantool-patches] [PATCH 1/2] errinj: introduce delayed injection Nikita Pettik 2020-04-30 20:15 ` Konstantin Osipov 2020-04-30 20:55 ` Nikita Pettik 2020-05-01 19:15 ` Konstantin Osipov 2020-05-03 19:20 ` Vladislav Shpilevoy 2020-05-07 13:50 ` Nikita Pettik 2020-05-07 21:47 ` Vladislav Shpilevoy 2020-05-07 22:41 ` Nikita Pettik 2020-04-30 19:27 ` [Tarantool-patches] [PATCH 2/2] vinyl: drop wasted runs in case range recovery fails Nikita Pettik 2020-05-03 19:21 ` Vladislav Shpilevoy 2020-05-07 13:02 ` Nikita Pettik 2020-05-07 14:16 ` Konstantin Osipov 2020-05-07 21:47 ` Vladislav Shpilevoy 2020-05-07 22:37 ` Nikita Pettik 2020-05-07 21:47 ` Vladislav Shpilevoy 2020-05-07 22:36 ` Nikita Pettik [this message] 2020-05-10 19:59 ` Vladislav Shpilevoy 2020-05-12 1:16 ` Nikita Pettik 2020-05-03 19:20 ` [Tarantool-patches] [PATCH 0/2] Fix crash in case of lack of FDs during recovery Vladislav Shpilevoy 2020-05-07 14:11 ` Nikita Pettik 2020-05-12 20:53 ` Vladislav Shpilevoy 2020-05-12 20:56 ` Vladislav Shpilevoy 2020-05-12 22:45 ` Nikita Pettik 2020-05-13 20:19 ` Vladislav Shpilevoy
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=20200507223625.GB13970@tarantool.org \ --to=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 2/2] vinyl: drop wasted runs in case range recovery fails' \ /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