From: Nikita Pettik <korablev@tarantool.org> To: Aleksandr Lyapunov <alyapunov@tarantool.org> Cc: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org Subject: Re: [Tarantool-patches] [PATCH v3 3/3] vinyl: clean-up write iterator if vy_task_write_run() fails Date: Thu, 7 May 2020 00:36:17 +0000 [thread overview] Message-ID: <20200507003617.GB9992@tarantool.org> (raw) In-Reply-To: <653509c4-55b0-a7cb-55ab-eb534a0e6421@tarantool.org> On 06 May 13:37, Aleksandr Lyapunov wrote: > It's very strange, as I see start() method already makes its own cleanup > in case of failure and does not require 'stop' call in this case. > If it does not do it correctly - it must be fixed (or removed completely, > but it seems to be very serious change). Turns out start() doesn't provide proper clean-up: in case vy_write_iterator_add_src() fails, only last source is cleaned up, meanwhile the rest will be destroyed in vy_write_iterator_stop(). I've moved clean-up part from stop() method right to start(). Here's diff: diff --git a/src/box/vy_scheduler.c b/src/box/vy_scheduler.c index 387f58723..9dba93d34 100644 --- a/src/box/vy_scheduler.c +++ b/src/box/vy_scheduler.c @@ -1065,10 +1065,8 @@ vy_task_write_run(struct vy_task *task, bool no_compression) no_compression) != 0) goto fail; - if (wi->iface->start(wi) != 0) { - wi->iface->stop(wi); + if (wi->iface->start(wi) != 0) goto fail_abort_writer; - } int rc; int loops = 0; struct tuple *stmt = NULL; diff --git a/src/box/vy_write_iterator.c b/src/box/vy_write_iterator.c index 21c18d3dc..33ad5ed51 100644 --- a/src/box/vy_write_iterator.c +++ b/src/box/vy_write_iterator.c @@ -401,18 +401,23 @@ vy_write_iterator_start(struct vy_stmt_stream *vstream) struct vy_write_src *src, *tmp; rlist_foreach_entry_safe(src, &stream->src_list, in_src_list, tmp) { if (vy_write_iterator_add_src(stream, src) != 0) - return -1; + goto fail; #ifndef NDEBUG struct errinj *inj = errinj(ERRINJ_VY_WRITE_ITERATOR_START_FAIL, ERRINJ_BOOL); if (inj != NULL && inj->bparam) { inj->bparam = false; diag_set(OutOfMemory, 666, "malloc", "struct vy_stmt"); - return -1; + goto fail; } #endif } return 0; +fail: + /* Clean-up all previously added sources. */ + rlist_foreach_entry_safe(src, &stream->src_list, in_src_list, tmp) + vy_write_iterator_delete_src(stream, src); + return -1; }
next prev parent reply other threads:[~2020-05-07 0:36 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 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 [this message] 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=20200507003617.GB9992@tarantool.org \ --to=korablev@tarantool.org \ --cc=alyapunov@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@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