Tarantool development patches archive
 help / color / mirror / Atom feed
From: Konstantin Osipov <kostja@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Max Melentiev <m.melentiev@corp.mail.ru>
Subject: [tarantool-patches] Re: [PATCH] tarantoolctl doesn't fail when box.cfg is delayed in init script
Date: Mon, 19 Aug 2019 10:54:57 +0300	[thread overview]
Message-ID: <20190819075457.GA18442@atlas> (raw)
In-Reply-To: <20190819073936.37388-1-m.melentiev@corp.mail.ru>

* Max Melentiev <dmarc-noreply@freelists.org> [19/08/19 10:40]:
> Before this patch tarantoolctl failed with error if box.cfg
> was not called in init script because it used too patch box.cfg
> once again after init script. I've changed it to patch box.cfg
> second time inside wrapper_cfg.

Please explain better what this patch does, not how you achieved
that.

And while you are at it, explain why we need a secondary patching
of box.cfg at all. What's the point of preserving the pid file?

tarantoolctl: allow to start instances without a box.cfg{}

Before this patch, tarantoolctl would fail if box.cfg{} was not
called in an instance script.

This patch allows to start an instance without box.cfg{} in it. 
Such an instance:
- may only be started under systemd? 
- what can it do? 
- ???

Please add a docboc entry, since it 's a significant behaviour
change. How such an instance is used? 

Otherwise LTGM.


> ---
>  extra/dist/tarantoolctl.in | 21 +++++++++------------
>  1 file changed, 9 insertions(+), 12 deletions(-)
> 
> diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
> index 8adb57533..fd1abf9dc 100755
> --- a/extra/dist/tarantoolctl.in
> +++ b/extra/dist/tarantoolctl.in
> @@ -483,6 +483,15 @@ local function wrapper_cfg(cfg)
>          os.exit(1)
>      end
>  
> +    local box_cfg_mt = getmetatable(box.cfg)
> +    local orig_cfg_call = box_cfg_mt.__call
> +    box_cfg_mt.__call = function(old_cfg, new_cfg)
> +        if old_cfg.pid_file ~= nil and new_cfg ~= nil and new_cfg.pid_file ~= nil then
> +            new_cfg.pid_file = old_cfg.pid_file
> +        end
> +        orig_cfg_call(old_cfg, new_cfg)
> +    end
> +
>      return data
>  end
>  
> @@ -547,18 +556,6 @@ local function start()
>          end
>          os.exit(1)
>      end
> -    local box_cfg_mt = getmetatable(box.cfg)
> -    if box_cfg_mt == nil then
> -        log.error('box.cfg() is not called in an instance file')
> -        os.exit(1)
> -    end
> -    local old_call = box_cfg_mt.__call
> -    box_cfg_mt.__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

-- 
Konstantin Osipov, Moscow, Russia

  reply	other threads:[~2019-08-19  7:55 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-19  7:39 [tarantool-patches] " Max Melentiev
2019-08-19  7:54 ` Konstantin Osipov [this message]
2019-08-19  9:48   ` [tarantool-patches] " Maxim Melentiev
2019-08-19 15:05     ` Alexander Turenko
2019-08-20 11:24       ` Maxim Melentiev
2019-08-20 11:55         ` Konstantin Osipov
2019-08-20 23:15         ` Alexander Turenko
2019-08-22 13:06           ` Kirill Yukhin
2019-08-20 11:54     ` Konstantin Osipov
2019-08-20 12:08   ` Maxim Melentiev

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=20190819075457.GA18442@atlas \
    --to=kostja@tarantool.org \
    --cc=m.melentiev@corp.mail.ru \
    --cc=tarantool-patches@freelists.org \
    --subject='[tarantool-patches] Re: [PATCH] tarantoolctl doesn'\''t fail when box.cfg is delayed in init script' \
    /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