From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Leonid Vasiliev <lvasiliev@tarantool.org>, imeevma@tarantool.org, korablev@tarantool.org, sergos@tarantool.org, m.semkin@corp.mail.ru Cc: Mergen Imeev <imeevma@gmail.com>, tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v2 1/3] sql: add missing diag_set on failure when working with files inside SQL module Date: Sun, 13 Dec 2020 19:30:13 +0100 [thread overview] Message-ID: <94d760ec-8174-c4dd-f65d-2478c24f1a96@tarantool.org> (raw) In-Reply-To: <09684330fa61f01381f05bbbc0e49e567a8a14a7.1607696813.git.lvasiliev@tarantool.org> Hi! Thanks for the patchset! On 11.12.2020 15:49, Leonid Vasiliev wrote: > From: Mergen Imeev <imeevma@gmail.com> > > SQL module didn't set an error in the diagnostics area on a file > operation failure. This could lead to a crash like in #5537. > > Part of #5537 > --- > src/box/sql/os_unix.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/src/box/sql/os_unix.c b/src/box/sql/os_unix.c > index b351c55..557d709 100644 > --- a/src/box/sql/os_unix.c > +++ b/src/box/sql/os_unix.c > @@ -159,14 +159,17 @@ robust_open(const char *z, int f, mode_t m) > if (fd < 0) { > if (errno == EINTR) > continue; > + diag_set(SystemError, strerror(errno)); > break; SystemError already reports strerror() in ::log() method. I don't think you need to duplicate it. Better add a proper description. For example, the path. Grep "diag_set(SystemError" in our project and see other usages which try to provide more info. The same in other places. > } > if (fd >= SQL_MINIMUM_FILE_DESCRIPTOR) > break; > close(fd); > fd = -1; > - if (open("/dev/null", f, m) < 0) > + if (open("/dev/null", f, m) < 0) { > + diag_set(SystemError, strerror(errno)); > break; > + } > } > if (fd >= 0) { > if (m != 0) { > @@ -831,8 +834,10 @@ seekAndWriteFd(int fd, /* File descriptor to write to */ > rc = write(fd, pBuf, nBuf); > } while (rc < 0 && errno == EINTR); > > - if (rc < 0) > + if (rc < 0) { > + diag_set(SystemError, strerror(errno)); > *piErrno = errno; > + } > return rc; > } > >
next prev parent reply other threads:[~2020-12-13 18:30 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 [this message] 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 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=94d760ec-8174-c4dd-f65d-2478c24f1a96@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=imeevma@gmail.com \ --cc=imeevma@tarantool.org \ --cc=korablev@tarantool.org \ --cc=lvasiliev@tarantool.org \ --cc=m.semkin@corp.mail.ru \ --cc=sergos@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 1/3] sql: add missing diag_set on failure when working with files inside SQL module' \ /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