From: Sergey Ostanevich <sergos@tarantool.org>
To: Leonid Vasiliev <lvasiliev@tarantool.org>
Cc: m.semkin@corp.mail.ru,
Vladislav Shpilevoy <v.shpilevoy@tarantool.org>,
tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v2 2/3] sql: set an error to diag in sql_execute() on failure
Date: Wed, 16 Dec 2020 00:05:48 +0300 [thread overview]
Message-ID: <4E6B04B4-3CE4-4872-91C5-263D94874353@tarantool.org> (raw)
In-Reply-To: <77019226-cbc8-f65c-a75d-6dfcadea0d9a@tarantool.org>
Thanks for the patch!
Effectively we just cover SIGSEGV that inevitably appear in iproto either
in box.execute - both access diag as if it set in case of non-zero result.
LGTM.
Sergos
> On 14 Dec 2020, at 18:52, Leonid Vasiliev <lvasiliev@tarantool.org> wrote:
>
> Hi! Thank you for the review.
>
> On 13.12.2020 21:30, Vladislav Shpilevoy wrote:
>> Thanks for the patch!
>> I agree with Nikita here. The change is dangerous. If there is
>> no a diag, but the query failed, it means something is very wrong,
>> and it is not safe to continue execution. A panic() would be
>> better here.
> OK. I don't mind.
>
> New patch:
>
> sql: add panic() call in sql_execute() on complete failure
>
> In SQL, on failure sometimes an error sets to the diag, sometimes not.
> And this can dived to situation as in #5537(SEGFAULT).
> So, let's call `panic()` in that case, because something is very wrong,
> and it is not safe to continue execution.
>
> Part of #5537
> ---
> src/box/execute.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/src/box/execute.c b/src/box/execute.c
> index e14da20..a424349 100644
> --- a/src/box/execute.c
> +++ b/src/box/execute.c
> @@ -687,8 +687,18 @@ sql_execute(struct sql_stmt *stmt, struct port *port, struct region *region)
> rc = sql_step(stmt);
> assert(rc != SQL_ROW && rc != 0);
> }
> - if (rc != SQL_DONE)
> + if (rc != SQL_DONE) {
> + /*
> + * In SQL, on failure sometimes an error sets to the diag,
> + * sometimes not. So, let's call `panic()` in that case, because
> + * something is very wrong, and it is not safe to continue
> + * execution.
> + */
> + if (diag_is_empty(diag_get()))
> + panic("failed to execute SQL statement");
> +
> return -1;
> + }
> return 0;
> }
next prev parent reply other threads:[~2020-12-15 21:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-11 14:49 [Tarantool-patches] [PATCH v2 0/3] Fix working with temporary files in VDBE Leonid Vasiliev
2020-12-11 14:49 ` [Tarantool-patches] [PATCH v2 1/3] sql: add missing diag_set on failure when working with files inside SQL module Leonid Vasiliev
2020-12-13 18:30 ` Vladislav Shpilevoy
2020-12-14 15:49 ` Leonid Vasiliev
2020-12-15 20:29 ` Sergey Ostanevich
2020-12-15 22:12 ` Vladislav Shpilevoy
2020-12-16 23:17 ` Leonid Vasiliev
2020-12-11 14:49 ` [Tarantool-patches] [PATCH v2 2/3] sql: set an error to diag in sql_execute() on failure Leonid Vasiliev
2020-12-11 15:03 ` Nikita Pettik
2020-12-11 15:40 ` Leonid Vasiliev
2020-12-13 18:30 ` Vladislav Shpilevoy
2020-12-14 15:52 ` Leonid Vasiliev
2020-12-15 21:05 ` Sergey Ostanevich [this message]
2020-12-11 14:49 ` [Tarantool-patches] [PATCH v2 3/3] sql: update temporary file name format Leonid Vasiliev
2020-12-13 18:30 ` Vladislav Shpilevoy
2020-12-14 15:54 ` Leonid Vasiliev
2020-12-15 21:07 ` Sergey Ostanevich
2020-12-16 14:47 ` Nikita Pettik
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=4E6B04B4-3CE4-4872-91C5-263D94874353@tarantool.org \
--to=sergos@tarantool.org \
--cc=lvasiliev@tarantool.org \
--cc=m.semkin@corp.mail.ru \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2 2/3] sql: set an error to diag in sql_execute() on 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