From: Igor Munkin <imun@tarantool.org> To: Maria <maria.khaydich@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH] box.execute should be immutable function Date: Tue, 17 Dec 2019 17:39:40 +0300 [thread overview] Message-ID: <20191217143940.GQ1214@tarantool.org> (raw) In-Reply-To: <20191114115020.21091-1-maria.khaydich@tarantool.org> Masha, Thanks for the patch! I join to all remarks left by Nikita. Besides, I added a couple new below related to the patch itself. On 14.11.19, Maria wrote: > Using box.execute method before explicitly > configuring box automatically invoked box.cfg > nonetheless. Any further calls to the latter > caused its reconfiguration which could lead > to an error when trying to use the method. > > Closes #4231 > Issue: > https://github.com/tarantool/tarantool/issues/4231 > Branch: > https://github.com/tarantool/tarantool/compare/eljashm/gh-4231-box.execute-immutable-function > --- > src/box/lua/load_cfg.lua | 4 +++- > test/box-tap/execute.test.lua | 17 +++++++++++++++++ > 2 files changed, 20 insertions(+), 1 deletion(-) > create mode 100755 test/box-tap/execute.test.lua > > diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua > index e7f62cf4e..042edf913 100644 > --- a/src/box/lua/load_cfg.lua > +++ b/src/box/lua/load_cfg.lua > @@ -528,7 +528,9 @@ box.cfg = locked(load_cfg) > -- metatable. > -- > function box.execute(...) > - load_cfg() I had to read a lot of source code to dive into the problem to be fixed. It's OK, but IMHO it would be great if you dropped a few words right here about the bug and mentioned the related issue. This would definitely simplify further maintenance. > + if not box.cfg then This condition solves the reported problem (the test you provided within this patch is OK), but consider the following: | $ git lo -1 | ec09fcaac <snipped> box.execute should be immutable function | $ ./tarantool -V | Tarantool 2.3.0-161-gec09fcaac | <snipped> | $ echo 'box.execute("SELECT 1")' | timeout -s 9 3 ./tarantool | Killed Thus box.execute call prior to box.cfg invokation hangs Tarantool after your patch. I'm totally not into SQL design but AFAIS such box.execute invokation ought to call loag_cfg underneath. However it doesn't since box.cfg is initialized with function several lines above, the check is failed and Tarantool goes into deep recursion. I guess you can introduce a local flag and use it as an upvalue in both box.execute and load_cfg functions. The flag is to be initialized to false, set in the load_cfg call and check within box.execute. However feel free to provide your own solution. > + load_cfg() > + end > return box.execute(...) > end > > diff --git a/test/box-tap/execute.test.lua b/test/box-tap/execute.test.lua > new file mode 100755 > index 000000000..301cf4a1c > --- /dev/null > +++ b/test/box-tap/execute.test.lua > @@ -0,0 +1,17 @@ > +#!/usr/bin/env tarantool > + > +local tap = require('tap') > +local test = tap.test('execute') > +test:plan(1) > + > +local box_execute = box.execute Please consider to add the check related to the flaw found above. > +box.cfg{} > + > +local status, err = pcall( > + function() > + box_execute("CREATE TABLE t1 (s1 INTEGER, PRIMARY KEY (s1));") Minor: A trailing whitespace is left above. > + end) There is a common code style for pcall an anonymous multiline Lua function within box-tap (see [1] and [2]). Please adjust yours considering it. > + > +test:ok(status and err == nil, "box.execute after box.cfg") Please consider the comment regarding the test finalization[3]. > +test:check() > +os.exit(0) > -- > 2.21.0 (Apple Git-122.2) > [1]: https://github.com/tarantool/tarantool/blob/master/test/box-tap/cfg.test.lua#L148 [2]: https://github.com/tarantool/tarantool/blob/master/test/box-tap/merger.test.lua#L573 [3]: https://github.com/tarantool/tarantool/issues/4655#issue-529430689 -- Best regards, IM
next prev parent reply other threads:[~2019-12-17 14:41 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-14 11:50 Maria 2019-11-14 16:51 ` Nikita Pettik 2019-12-17 14:39 ` Igor Munkin [this message] 2019-12-24 15:32 ` [Tarantool-patches] [PATCH] box: make box.execute() immutable Maria Khaydich 2019-12-25 1:30 ` Igor Munkin 2019-12-26 14:08 ` Alexander Turenko 2020-01-13 12:13 ` Maria Khaydich 2020-01-13 15:48 ` Igor Munkin 2020-01-18 10:56 ` Maria Khaydich 2020-02-20 17:51 ` Alexander Turenko 2020-02-20 21:15 ` Igor Munkin 2020-03-11 15:56 ` Maria Khaydich 2020-03-18 22:25 ` Igor Munkin 2020-05-02 14:52 ` Alexander Turenko 2020-05-12 16:16 ` Alexander Turenko 2020-03-11 15:57 ` [Tarantool-patches] [PATCH 1/2] box: make box.cfg idempotent function Maria Khaydich 2020-03-12 13:29 ` Konstantin Osipov 2020-03-12 19:25 ` Maria Khaydich 2020-03-12 20:00 ` Konstantin Osipov 2020-03-18 22:26 ` Igor Munkin 2020-03-19 7:19 ` Konstantin Osipov 2020-03-19 9:08 ` Igor Munkin 2020-03-19 10:06 ` Konstantin Osipov 2020-03-19 10:26 ` Igor Munkin 2020-05-06 11:17 ` Alexander Turenko 2020-05-06 11:49 ` Konstantin Osipov 2020-05-06 12:53 ` Alexander Turenko 2020-05-06 13:02 ` Konstantin Osipov 2020-05-06 13:13 ` Alexander Turenko 2020-03-18 22:26 ` Igor Munkin 2020-05-12 16:17 ` Alexander Turenko
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=20191217143940.GQ1214@tarantool.org \ --to=imun@tarantool.org \ --cc=maria.khaydich@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH] box.execute should be immutable function' \ /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