From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 7D1FC285C2 for ; Mon, 13 Aug 2018 00:36:09 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nTPpszA4EK8q for ; Mon, 13 Aug 2018 00:36:09 -0400 (EDT) Received: from smtp60.i.mail.ru (smtp60.i.mail.ru [217.69.128.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 399FB285B5 for ; Mon, 13 Aug 2018 00:36:09 -0400 (EDT) From: Georgy Kirichenko Subject: [tarantool-patches] Re: [PATCH v2] lua: fix for option pid_file overwritten by tarantoolctl Date: Mon, 13 Aug 2018 07:36:00 +0300 Message-ID: <56828544.hX0PqxU9Ht@home.lan> In-Reply-To: <20180731143549.28159-1-k.belyavskiy@tarantool.org> References: <20180731143549.28159-1-k.belyavskiy@tarantool.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1656566.RnxHOCKlZz"; micalg="pgp-sha256"; protocol="application/pgp-signature" Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: Konstantin Belyavskiy --nextPart1656566.RnxHOCKlZz Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" LGTM, thanks On Tuesday, July 31, 2018 5:35:49 PM MSK Konstantin Belyavskiy wrote: > During startup tarantoolctl ignores 'pid_file' option and set it to > default value. > This cause a fault if user tries to execute config with option set. > In case of being started with tarantoolctl shadow this option with > additional wrapper around box.cfg. > > Changes in V2: > Use local defined closure instead of a global function with a > variable (based on @GeorgyKirichenko proposal). > > Closes #3214 > --- > ticket: https://github.com/tarantool/tarantool/issues/3214 > branch: > https://github.com/tarantool/tarantool/tree/kbelyavs/gh-3214-tarantoolctl-p > idfile-fix extra/dist/tarantoolctl.in | 7 +++++++ > test/box/cfg.result | 30 ++++++++++++++++++++++++++++++ > test/box/cfg.test.lua | 12 ++++++++++++ > 3 files changed, 49 insertions(+) > > diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in > index 507ebe8bf..4c7dfa2f1 100755 > --- a/extra/dist/tarantoolctl.in > +++ b/extra/dist/tarantoolctl.in > @@ -527,6 +527,13 @@ local function start() > end > os.exit(1) > end > + local old_call = getmetatable(box.cfg).__call > + getmetatable(box.cfg).__call = function(old_cfg, cfg) > + if old_cfg.pid_file ~= nil and cfg ~= nil and cfg.pid_file ~= nil > then + cfg.pid_file = old_cfg.pid_file > + end > + old_call(old_cfg, cfg) > + end > return 0 > end > > diff --git a/test/box/cfg.result b/test/box/cfg.result > index cda7aa0d3..a2df83310 100644 > --- a/test/box/cfg.result > +++ b/test/box/cfg.result > @@ -365,6 +365,36 @@ test_run:cmd("cleanup server cfg_tester4") > - true > ... > --------------------------------------------------------------------------- > ----- +-- Check fix for pid_file option overwritten by tarantoolctl > +--------------------------------------------------------------------------- > ----- +test_run:cmd('create server cfg_tester5 with script = > "box/lua/cfg_test1.lua"') +--- > +- true > +... > +test_run:cmd("start server cfg_tester5") > +--- > +- true > +... > +test_run:cmd('switch cfg_tester5') > +--- > +- true > +... > +box.cfg{pid_file = "current.pid"} > +--- > +... > +test_run:cmd("switch default") > +--- > +- true > +... > +test_run:cmd("stop server cfg_tester5") > +--- > +- true > +... > +test_run:cmd("cleanup server cfg_tester5") > +--- > +- true > +... > +--------------------------------------------------------------------------- > ----- -- Check that 'vinyl_dir' cfg option is not checked as long as > -- there is no vinyl indexes (issue #2664) > --------------------------------------------------------------------------- > ----- diff --git a/test/box/cfg.test.lua b/test/box/cfg.test.lua > index dbb463025..712a165bb 100644 > --- a/test/box/cfg.test.lua > +++ b/test/box/cfg.test.lua > @@ -69,6 +69,18 @@ test_run:cmd("switch default") > test_run:cmd("stop server cfg_tester4") > test_run:cmd("cleanup server cfg_tester4") > > +--------------------------------------------------------------------------- > ----- +-- Check fix for pid_file option overwritten by tarantoolctl > +--------------------------------------------------------------------------- > ----- + > +test_run:cmd('create server cfg_tester5 with script = > "box/lua/cfg_test1.lua"') +test_run:cmd("start server cfg_tester5") > +test_run:cmd('switch cfg_tester5') > +box.cfg{pid_file = "current.pid"} > +test_run:cmd("switch default") > +test_run:cmd("stop server cfg_tester5") > +test_run:cmd("cleanup server cfg_tester5") > + > --------------------------------------------------------------------------- > ----- -- Check that 'vinyl_dir' cfg option is not checked as long as > -- there is no vinyl indexes (issue #2664) --nextPart1656566.RnxHOCKlZz Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEBJFDbU76LsBbgHBsvKOmCX79zb4FAltxCrAACgkQvKOmCX79 zb5GuQgAoI0HaE2n5MAYuFKU8e4M+SMYnSOXVAU+mpiIlISK26drmIanFZ6Ck60c bhKbPQYC4qmuhDb6XPdXEflYg7O2400J3LpYn4M0xbAoaz647C/DalWzg3WysCGM eCrzPbI4qio1/l3mkD7qrPi8DUDGG6tJhF9dAH9hmiDWpxruVvDPFoQXz608fQ0q CrQD0qkE7Icq6+WnO0R1E7IHxTMWdTjpf+TLm89V0sQBNek1JSMC2EJPkW+WraI7 eQEcfqzFB8IfNSu0digAA4KQviu8/NZFWzgU8CqjWD9o/xZiZzBuKiPbK4yFzerj llrngQtrbei4/k1ITpoKsi4y45A/Zg== =RmDo -----END PGP SIGNATURE----- --nextPart1656566.RnxHOCKlZz--