From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Nikita Pettik <korablev@tarantool.org>, tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v3 3/3] vinyl: clean-up write iterator if vy_task_write_run() fails Date: Fri, 1 May 2020 02:55:40 +0200 [thread overview] Message-ID: <19283eae-5eb9-3edb-2dea-8588874e174b@tarantool.org> (raw) In-Reply-To: <7965217ceed66d448cee453c690e8d91ba7a841b.1587948306.git.korablev@tarantool.org> Hi! Thanks for the patch! See 3 comments below. > diff --git a/src/box/vy_scheduler.c b/src/box/vy_scheduler.c > index 9dba93d34..387f58723 100644 > --- a/src/box/vy_scheduler.c > +++ b/src/box/vy_scheduler.c > @@ -1065,8 +1065,10 @@ vy_task_write_run(struct vy_task *task, bool no_compression) > no_compression) != 0) > goto fail; > > - if (wi->iface->start(wi) != 0) > + if (wi->iface->start(wi) != 0) { > + wi->iface->stop(wi); 1. I would better make start() more self-sufficient. Otherwise it failed to start, and yet you somewhy need to stop it. Looks confusing. > goto fail_abort_writer; > + } > diff --git a/test/vinyl/gh-4864-stmt-alloc-fail-compact.result b/test/vinyl/gh-4864-stmt-alloc-fail-compact.result > index af116a4b4..ea8dce0ba 100644 > --- a/test/vinyl/gh-4864-stmt-alloc-fail-compact.result > +++ b/test/vinyl/gh-4864-stmt-alloc-fail-compact.result > @@ -242,6 +242,91 @@ s:drop() > +assert(s.index.pk:stat().range_count == 1) > + | --- > + | - true > + | ... > +assert(s.index.pk:stat().run_count == 2) > + | --- > + | - true > + | ... > + > +errinj.set('ERRINJ_VY_WRITE_ITERATOR_START_FAIL', true) > + | --- > + | - ok > + | ... > +-- Prevent next attempt to compact in a row. > +-- > +errinj.set("ERRINJ_VY_SCHED_TIMEOUT", 1) > + | --- > + | - ok > + | ... > + > +s.index.pk:compact() > + | --- > + | ... > +-- Leave a time gap between compaction and index drop just in case > +-- (to make sure that compaction is already finished (re-scheduled) > +-- when at the moment of index drop). > +-- > +fiber.sleep(0.5) 2. Can't you wait for compaction actively on some condition? Such as smaller run count. Half of second is quite a big timeout for a regular test. > + | --- > + | ... > + > +-- Drop is required to unref all tuples. > +-- > +s:drop() > + | --- > + | ... > +-- After index is dropped, not all tuples are deallocated at once: > +-- they may be still referenced (while being pushed) in Lua. So > +-- invoke GC explicitly. > +-- > +collectgarbage("collect") > + | --- > + | - 0 > + | ... > +-- Give GC some time to operate on. > +-- > +fiber.sleep(1) 3. GC is synchronous. So if collectgarbage() has returned, GC is done. > + | --- > + | ... > +
next prev parent reply other threads:[~2020-05-01 0:55 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-27 0:52 [Tarantool-patches] [PATCH v3 0/3] vinyl: fix uninitialized memory accesses Nikita Pettik 2020-04-27 0:52 ` [Tarantool-patches] [PATCH v3 1/3] vinyl: init all vars before cleanup in vy_lsm_split_range() Nikita Pettik 2020-05-06 9:04 ` Aleksandr Lyapunov 2020-05-06 13:12 ` Nikita Pettik 2020-05-06 17:52 ` Aleksandr Lyapunov 2020-05-07 1:09 ` Nikita Pettik 2020-04-27 0:52 ` [Tarantool-patches] [PATCH v3 2/3] vinyl: clean-up unprocessed read views in *_build_read_views() Nikita Pettik 2020-05-06 9:56 ` Aleksandr Lyapunov 2020-05-07 0:29 ` Nikita Pettik 2020-05-07 8:44 ` Aleksandr Lyapunov 2020-05-07 12:28 ` Nikita Pettik 2020-04-27 0:52 ` [Tarantool-patches] [PATCH v3 3/3] vinyl: clean-up write iterator if vy_task_write_run() fails Nikita Pettik 2020-05-01 0:55 ` Vladislav Shpilevoy [this message] 2020-05-03 9:22 ` Konstantin Osipov 2020-05-07 0:38 ` Nikita Pettik 2020-05-06 10:37 ` Aleksandr Lyapunov 2020-05-07 0:36 ` Nikita Pettik 2020-05-07 7:53 ` Aleksandr Lyapunov 2020-05-07 22:16 ` Nikita Pettik 2020-05-08 16:29 ` Aleksandr Lyapunov
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=19283eae-5eb9-3edb-2dea-8588874e174b@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 3/3] vinyl: clean-up write iterator if vy_task_write_run() 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