Tarantool development patches archive
 help / color / mirror / Atom feed
From: Georgy Kirichenko <georgy@tarantool.org>
To: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: tarantool-patches@freelists.org
Subject: Re: [PATCH] box: serialize calls to box.cfg
Date: Tue, 07 Aug 2018 14:26:49 +0300	[thread overview]
Message-ID: <2423915.YWta1rXLNJ@localhost> (raw)
In-Reply-To: <20180807110901.z3thcmcwkt3qkyrm@esperanza>

[-- Attachment #1: Type: text/plain, Size: 2328 bytes --]

Looks good to me

On Tuesday, August 7, 2018 2:09:01 PM MSK Vladimir Davydov wrote:
> On Tue, Aug 07, 2018 at 12:43:26PM +0300, Vladimir Davydov wrote:
> > It is dangerous to call box.cfg() concurrently from different fibers.
> > For example, replication configuration uses static variables and yields
> > so calling it concurrently can result in a crash. To make sure it never
> > happens, let's protect box.cfg() with a lock.
> > 
> > Closes #3606
> > ---
> > https://github.com/tarantool/tarantool/issues/3606
> > https://github.com/tarantool/tarantool/tree/dv/gh-3606-concurrent-replicat
> > ion-cfg-fix> 
> >  src/box/lua/load_cfg.lua       | 21 ++++++++++++++++++---
> >  test/replication/misc.result   | 24 ++++++++++++++++++++++++
> >  test/replication/misc.test.lua | 10 ++++++++++
> >  3 files changed, 52 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
> > index 0b668cdc..4de79220 100644
> > --- a/src/box/lua/load_cfg.lua
> > +++ b/src/box/lua/load_cfg.lua
> > @@ -5,6 +5,21 @@ local json = require('json')
> > 
> >  local private = require('box.internal')
> >  local urilib = require('uri')
> >  local math = require('math')
> > 
> > +local fiber = require('fiber')
> > +
> > +-- Function decorator that is used to prevent box.cfg() from
> > +-- being called concurrently by different fibers.
> > +local lock = fiber.channel(1)
> > +local function locked(f)
> > +    return function(...)
> > +        lock:put(true)
> > +        local status = pcall(f, ...)
> > +        lock:get()
> > +        if not status then
> > +            box.error()
> > +        end
> > +    end
> > +end
> 
> Georgy noted that we'd better use error() to re-throw the error returned
> by box.cfg(). Updated on the branch, the incremental diff is below:
> 
> diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
> index 4de79220..c68a3583 100644
> --- a/src/box/lua/load_cfg.lua
> +++ b/src/box/lua/load_cfg.lua
> @@ -13,10 +13,10 @@ local lock = fiber.channel(1)
>  local function locked(f)
>      return function(...)
>          lock:put(true)
> -        local status = pcall(f, ...)
> +        local status, err = pcall(f, ...)
>          lock:get()
>          if not status then
> -            box.error()
> +            error(err)
>          end
>      end
>  end


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2018-08-07 11:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-07  9:43 Vladimir Davydov
2018-08-07 11:09 ` Vladimir Davydov
2018-08-07 11:26   ` Georgy Kirichenko [this message]
2018-08-07 11:39 ` [tarantool-patches] " Kirill Yukhin

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=2423915.YWta1rXLNJ@localhost \
    --to=georgy@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --cc=vdavydov.dev@gmail.com \
    --subject='Re: [PATCH] box: serialize calls to box.cfg' \
    /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