From: Cyrill Gorcunov <gorcunov@gmail.com>
To: Kirill Yukhin <kyukhin@tarantool.org>
Cc: tml <tarantool-patches@dev.tarantool.org>
Subject: [Tarantool-patches] [PATCH v12 4/8] applier: add missing diag_set on region_alloc failure
Date: Tue, 7 Apr 2020 18:14:57 +0300 [thread overview]
Message-ID: <20200407151500.3410-5-gorcunov@gmail.com> (raw)
In-Reply-To: <20200407151500.3410-1-gorcunov@gmail.com>
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.
Acked-by: Sergey Ostanevich <sergos@tarantool.org>
Acked-by: Konstantin Osipov <kostja.osipov@gmail.com>
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 47a26c366..2eb1e04fc 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-04-07 15:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 15:14 [Tarantool-patches] [PATCH v12 0/8] replication: prevent nil dereference on applier rollback Cyrill Gorcunov
2020-04-07 15:14 ` [Tarantool-patches] [PATCH v12 1/8] box: fix bootstrap comment Cyrill Gorcunov
2020-04-07 15:14 ` [Tarantool-patches] [PATCH v12 2/8] alter: shrink txn_alter_trigger_new code Cyrill Gorcunov
2020-04-07 15:14 ` [Tarantool-patches] [PATCH v12 3/8] request: add missing OutOfMemory diag_set Cyrill Gorcunov
2020-04-07 15:14 ` Cyrill Gorcunov [this message]
2020-04-07 15:14 ` [Tarantool-patches] [PATCH v12 5/8] replication: merge replica_by_id into replicaset Cyrill Gorcunov
2020-04-07 15:14 ` [Tarantool-patches] [PATCH v12 6/8] applier: reduce applier_txn_rollback_cb code density Cyrill Gorcunov
2020-04-07 15:15 ` [Tarantool-patches] [PATCH v12 7/8] applier: prevent nil dereference on applier rollback Cyrill Gorcunov
2020-04-07 15:15 ` [Tarantool-patches] [PATCH v12 8/8] test: add replication/gh-4730-applier-rollback Cyrill Gorcunov
2020-04-08 11:04 ` [Tarantool-patches] [PATCH v12 0/8] replication: prevent nil dereference on applier rollback Kirill Yukhin
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=20200407151500.3410-5-gorcunov@gmail.com \
--to=gorcunov@gmail.com \
--cc=kyukhin@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v12 4/8] 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