From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Nikita Pettik <korablev@tarantool.org>, tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v2 05/10] box/error: don't set error created via box.error.new to diag Date: Fri, 27 Mar 2020 01:19:30 +0100 [thread overview] Message-ID: <536126ef-fef2-9f01-2d34-e0d1440d8eee@tarantool.org> (raw) In-Reply-To: <1816245c768216733779be5c7420cc60725287ea.1585097339.git.korablev@tarantool.org> Hi! Thanks for the patch! See 2 comments below. On 25/03/2020 02:43, Nikita Pettik wrote: > To achieve this let's refactor luaT_error_create() to return error > object instead of setting it via box_error_set(). > luaT_error_create() is used both to handle box.error() and > box.error.new() invocations, and box.error() is still expected to set > error to diagnostic area. So, luaT_error_call() which implements > box.error() processing at the end calls diag_set_error(). > It is worth mentioning that net.box module relied on the fact that > box.error.new() set error to diagnostic area: otherwise request errors > don't get to diagnostic area on client side. > > Needed for #1148 > Closes #4778 > > @TarantoolBot document > Title: Don't promote error created via box.error.new to diagnostic area > > Now box.error.new() only creates error object, but doesn't set it to > Tarantool's diagnostic area: > ``` > box.error.clear() > e = box.error.new({code = 111, reason = "cause"}) > assert(box.error.last() == nil) > --- > - true > ... > ``` > To set error in diagnostic area explicitly box.error.set() has been > introduced. It accepts error object which is set as last system error > (i.e. becomes available via box.error.last()). > Finally, box.error.new() does not longer accept error object as an > argument (this was undocumented feature). > Note that patch does not affect box.error(), which still pushed error to 1. 'pushed' -> 'pushes'. > diff --git a/src/box/lua/error.cc b/src/box/lua/error.cc > index 640e33910..ff285d7eb 100644 > --- a/src/box/lua/error.cc > +++ b/src/box/lua/error.cc > @@ -139,9 +144,12 @@ luaT_error_new(lua_State *L) > { > if (lua_gettop(L) == 0) > return luaL_error(L, "Usage: box.error.new(code, args)"); > - luaT_error_create(L, 1); > + struct error *e = luaT_error_create(L, 1); > + if (e == NULL) > + return luaL_error(L, "box.error.new(): bad arguments"); 2. I think it would be better to return the same 'Usage' error in case of a problem with arguments. Not two different messages meaning essentially the same. Or both should return 'bad arguments'. However with both 'Usage' the diff would be 1 line smaller. Other than these comments, LGTM. If you fix them both - then push right away.
next prev parent reply other threads:[~2020-03-27 0:19 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-25 1:42 [Tarantool-patches] [PATCH v2 00/10] Stacked diagnostics Nikita Pettik 2020-03-25 1:42 ` [Tarantool-patches] [PATCH v2 01/10] box: rfc for stacked diagnostic area Nikita Pettik 2020-03-25 8:27 ` Konstantin Osipov 2020-03-25 14:08 ` Nikita Pettik 2020-03-25 1:42 ` [Tarantool-patches] [PATCH v2 02/10] box: rename diag_add_error to diag_set_error Nikita Pettik 2020-03-25 8:27 ` Konstantin Osipov 2020-03-26 0:22 ` Vladislav Shpilevoy 2020-03-26 12:31 ` Nikita Pettik 2020-03-25 1:42 ` [Tarantool-patches] [PATCH v2 03/10] test: move box.error tests to box/error.test.lua Nikita Pettik 2020-03-25 8:28 ` Konstantin Osipov 2020-03-26 0:22 ` Vladislav Shpilevoy 2020-03-26 12:31 ` Nikita Pettik 2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 04/10] box/error: introduce box.error.set() method Nikita Pettik 2020-03-25 8:33 ` Konstantin Osipov 2020-03-25 17:41 ` Nikita Pettik 2020-03-26 0:22 ` Vladislav Shpilevoy 2020-03-26 12:31 ` Nikita Pettik 2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 05/10] box/error: don't set error created via box.error.new to diag Nikita Pettik 2020-03-26 16:50 ` Konstantin Osipov 2020-03-26 17:59 ` Nikita Pettik 2020-03-26 18:06 ` Nikita Pettik 2020-03-26 18:07 ` Alexander Turenko 2020-03-27 0:19 ` Vladislav Shpilevoy [this message] 2020-03-27 13:09 ` Nikita Pettik 2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 06/10] box: introduce stacked diagnostic area Nikita Pettik 2020-03-26 16:54 ` Konstantin Osipov 2020-03-26 18:03 ` Nikita Pettik 2020-03-26 18:08 ` Konstantin Osipov 2020-03-28 18:40 ` Vladislav Shpilevoy 2020-04-01 16:09 ` Nikita Pettik 2020-04-02 0:29 ` Vladislav Shpilevoy 2020-04-02 17:42 ` Nikita Pettik 2020-04-02 22:20 ` Vladislav Shpilevoy 2020-04-03 1:54 ` Nikita Pettik 2020-04-03 23:17 ` Vladislav Shpilevoy 2020-03-28 18:59 ` Vladislav Shpilevoy 2020-03-31 17:44 ` Nikita Pettik 2020-04-02 0:29 ` Vladislav Shpilevoy 2020-04-02 14:16 ` Nikita Pettik 2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 07/10] box: use stacked diagnostic area for functional indexes Nikita Pettik 2020-03-30 23:24 ` Vladislav Shpilevoy 2020-04-01 15:53 ` Nikita Pettik 2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 08/10] box/error: clarify purpose of reference counting in struct error Nikita Pettik 2020-03-30 23:24 ` Vladislav Shpilevoy 2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 09/10] iproto: refactor error encoding with mpstream Nikita Pettik 2020-03-30 23:24 ` Vladislav Shpilevoy 2020-04-01 15:54 ` Nikita Pettik 2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 10/10] iproto: support error stacked diagnostic area Nikita Pettik 2020-03-30 23:24 ` Vladislav Shpilevoy 2020-04-01 16:26 ` Nikita Pettik 2020-04-01 22:24 ` Nikita Pettik 2020-04-02 0:29 ` Vladislav Shpilevoy 2020-04-02 14:01 ` Nikita Pettik 2020-04-02 22:20 ` Vladislav Shpilevoy 2020-04-03 2:16 ` Nikita Pettik 2020-04-03 23:17 ` Vladislav Shpilevoy 2020-04-06 11:07 ` 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=536126ef-fef2-9f01-2d34-e0d1440d8eee@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 05/10] box/error: don'\''t set error created via box.error.new to diag' \ /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