Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladimir Davydov <vdavydov.dev@gmail.com>
To: Serge Petrenko <sergepetrenko@tarantool.org>
Cc: tarantool-patches@freelists.org
Subject: Re: [PATCH] tarantoolctl: fix cat and play for empty body requests
Date: Thu, 13 Sep 2018 16:04:41 +0300	[thread overview]
Message-ID: <20180913130441.36cmydekkvsjikyb@esperanza> (raw)
In-Reply-To: <20180911161506.69921-1-sergepetrenko@tarantool.org>

On Tue, Sep 11, 2018 at 07:15:06PM +0300, Serge Petrenko wrote:
> If space.before_replace returns the old tuple, the operation turns into
> no-op, but is still written to WAL as IPROTO_NOP for the sake of
> replication. Such a request doesn't have a body, and tarantoolctl failed
> to parse such requests in `tarantoolctl cat` and `tarantoolctl play`.
> Fix this by skipping such requests, since they have no effect anyway.
> 
> Closes #3675
> ---
> https://github.com/tarantool/tarantool/issues/3675
> https://github.com/tarantool/tarantool/tree/sp/gh-3675-tarantoolctl-cat-empty-body
> 
>  extra/dist/tarantoolctl.in | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)

Please add a test.

> 
> diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
> index 3d7ff3ec5..f7b6dd36d 100755
> --- a/extra/dist/tarantoolctl.in
> +++ b/extra/dist/tarantoolctl.in
> @@ -816,11 +816,14 @@ local function cat()
>      for id, file in ipairs(positional_arguments) do
>          log.error("Processing file '%s'", file)
>          for lsn, record in xlog.pairs(file) do
> -            local sid = record.BODY.space_id
> +            local sid = nil
> +            if record.BODY then
> +                sid = record.BODY.space_id
> +            end

Nit:

  local sid = record.BODY and record.BODY.space_id

>              local rid = record.HEADER.replica_id
> -            if (lsn < from) or
> +            if (lsn < from) or sid == nil or

I want to see BODY-less requests in the output while this code makes
tarantoolctl-cat ignore them AFAIU.

>                 (not spaces and sid and sid < 512 and not show_system) or
> -               (spaces and (sid == nil or not find_in_list(sid, spaces))) or
> +               (spaces and not find_in_list(sid, spaces)) or
>                 (replicas and not find_in_list(rid, replicas)) then
>                  -- pass this tuple
>              elseif lsn >= to then
> @@ -857,11 +860,14 @@ local function play()
>      for id, file in ipairs(positional_arguments) do
>          log.info(("Processing file '%s'"):format(file))
>          for lsn, record in xlog.pairs(file) do
> -            local sid = record.BODY.space_id
> +            local sid = nil
> +            if record.BODY then
> +                sid = record.BODY.space_id
> +            end
>              local rid = record.HEADER.replica_id
> -            if (lsn < from) or
> +            if (lsn < from) or sid == nil or
>                 (not spaces and sid and sid < 512 and not show_system) or
> -               (spaces and (sid == nil or not find_in_list(sid, spaces))) or
> +               (spaces and not find_in_list(sid, spaces)) or
>                 (replicas and not find_in_list(rid, replicas)) then
>                  -- pass this tuple
>              elseif lsn >= to then

  reply	other threads:[~2018-09-13 13:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-11 16:15 Serge Petrenko
2018-09-13 13:04 ` Vladimir Davydov [this message]
2018-09-14 14:39   ` [tarantool-patches] " Serge Petrenko

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=20180913130441.36cmydekkvsjikyb@esperanza \
    --to=vdavydov.dev@gmail.com \
    --cc=sergepetrenko@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [PATCH] tarantoolctl: fix cat and play for empty body requests' \
    /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