Tarantool development patches archive
 help / color / mirror / Atom feed
From: Konstantin Belyavskiy <k.belyavskiy@tarantool.org>
To: tarantool-patches@freelists.org
Subject: [tarantool-patches] [PATCH v2] lua: fix for option pid_file overwritten by tarantoolctl
Date: Tue, 31 Jul 2018 17:35:49 +0300	[thread overview]
Message-ID: <20180731143549.28159-1-k.belyavskiy@tarantool.org> (raw)

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-pidfile-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)
-- 
2.14.3 (Apple Git-98)

             reply	other threads:[~2018-07-31 14:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-31 14:35 Konstantin Belyavskiy [this message]
2018-08-13  4:36 ` [tarantool-patches] " Georgy Kirichenko
2018-08-21 15:24 ` [tarantool-patches] " Vladimir Davydov
  -- strict thread matches above, loose matches on Subject: below --
2018-07-23 17:07 Konstantin Belyavskiy

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=20180731143549.28159-1-k.belyavskiy@tarantool.org \
    --to=k.belyavskiy@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [tarantool-patches] [PATCH v2] lua: fix for option pid_file overwritten by tarantoolctl' \
    /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