From: Sergey Ostanevich <sergos@tarantool.org>
To: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: tml <tarantool-patches@dev.tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v7 2/5] box/applier: add missing diag_set on region_alloc failure
Date: Mon, 3 Feb 2020 17:39:28 +0300 [thread overview]
Message-ID: <20200203143928.GG547@tarantool.org> (raw)
In-Reply-To: <20200128192249.10023-3-gorcunov@gmail.com>
Hi!
Thanks for the patch!
LGTM.
Sergos
On 28 Jan 22:22, Cyrill Gorcunov wrote:
> In case if we're hitting memory limit allocating triggers
> we should setup diag error to prevent nil dereference
> in diag_raise call (for example from applier_apply_tx).
>
> Note that there are region_alloc_xc helpers which are
> throwing errors but as far as I understand we need the
> rollback action to process first instead of immediate
> throw/catch thus we use diag_set.
>
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
> src/box/applier.cc | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/src/box/applier.cc b/src/box/applier.cc
> index ae3d281a5..2ed5125d0 100644
> --- a/src/box/applier.cc
> +++ b/src/box/applier.cc
> @@ -796,8 +796,11 @@ applier_apply_tx(struct stailq *rows)
> sizeof(struct trigger));
> on_commit = (struct trigger *)region_alloc(&txn->region,
> sizeof(struct trigger));
> - if (on_rollback == NULL || on_commit == NULL)
> + if (on_rollback == NULL || on_commit == NULL) {
> + diag_set(OutOfMemory, sizeof(struct trigger),
> + "region_alloc", "on_rollback/on_commit");
> goto rollback;
> + }
>
> trigger_create(on_rollback, applier_txn_rollback_cb, NULL, NULL);
> txn_on_rollback(txn, on_rollback);
> --
> 2.20.1
>
next prev parent reply other threads:[~2020-02-03 14:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 19:22 [Tarantool-patches] [PATCH v7 0/5] box/replication: add missing diag set and fix sigsegv Cyrill Gorcunov
2020-01-28 19:22 ` [Tarantool-patches] [PATCH v7 1/5] box/request: add missing OutOfMemory diag_set Cyrill Gorcunov
2020-02-03 14:37 ` Sergey Ostanevich
2020-01-28 19:22 ` [Tarantool-patches] [PATCH v7 2/5] box/applier: add missing diag_set on region_alloc failure Cyrill Gorcunov
2020-02-03 14:39 ` Sergey Ostanevich [this message]
2020-02-04 22:15 ` Konstantin Osipov
2020-02-05 7:46 ` Cyrill Gorcunov
2020-02-05 9:49 ` Konstantin Osipov
2020-02-05 10:06 ` Cyrill Gorcunov
2020-01-28 19:22 ` [Tarantool-patches] [PATCH v7 3/5] box/applier: fix nil dereference in applier rollback Cyrill Gorcunov
2020-02-04 22:19 ` Konstantin Osipov
2020-02-05 7:33 ` Cyrill Gorcunov
2020-01-28 19:22 ` [Tarantool-patches] [PATCH v7 4/5] errinj: add ERRINJ_REPLICA_TXN_WRITE Cyrill Gorcunov
2020-02-04 22:45 ` Konstantin Osipov
2020-01-28 19:22 ` [Tarantool-patches] [PATCH v7 5/5] test: add replication/applier-rollback 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=20200203143928.GG547@tarantool.org \
--to=sergos@tarantool.org \
--cc=gorcunov@gmail.com \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v7 2/5] box/applier: add missing diag_set on region_alloc failure' \
/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