From: Serge Petrenko <sergepetrenko@tarantool.org>
To: vdavydov.dev@gmail.com
Cc: tarantool-patches@freelists.org,
Serge Petrenko <sergepetrenko@tarantool.org>
Subject: [PATCH 1/2] tarantoolctl: fix cat and play for empty body requests
Date: Fri, 14 Sep 2018 17:36:40 +0300 [thread overview]
Message-ID: <99dd15d5748aa49e99f7e98ce63f73dda63d25bc.1536934854.git.sergepetrenko@tarantool.org> (raw)
In-Reply-To: <cover.1536934854.git.sergepetrenko@tarantool.org>
In-Reply-To: <cover.1536934854.git.sergepetrenko@tarantool.org>
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 checking whether a request has a body. Also skip such
requests in `play`, since they have no effect.
Closes #3675
---
| 11 +++++++----
test/app-tap/tarantoolctl.test.lua | 14 +++++++++++---
2 files changed, 18 insertions(+), 7 deletions(-)
--git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
index 3d7ff3ec5..a6bd15e95 100755
--- a/extra/dist/tarantoolctl.in
+++ b/extra/dist/tarantoolctl.in
@@ -373,6 +373,9 @@ write_lua_table = function(tuple)
end
local function cat_lua_cb(record)
+ if record.HEADER.type == 'NOP' then
+ return
+ end
io.stdout:write(('box.space[%d]'):format(record.BODY.space_id))
local op = record.HEADER.type:lower()
io.stdout:write((':%s('):format(op))
@@ -816,7 +819,7 @@ 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 = record.BODY and record.BODY.space_id
local rid = record.HEADER.replica_id
if (lsn < from) or
(not spaces and sid and sid < 512 and not show_system) or
@@ -857,11 +860,11 @@ 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 = record.BODY and record.BODY.space_id
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
diff --git a/test/app-tap/tarantoolctl.test.lua b/test/app-tap/tarantoolctl.test.lua
index 340232ace..458e6c030 100755
--- a/test/app-tap/tarantoolctl.test.lua
+++ b/test/app-tap/tarantoolctl.test.lua
@@ -345,6 +345,10 @@ do
space:update({[1] = 2}, {[1] = {[1] = '\x3d', [2] = 3, [3] = 4}})
space:upsert({[1] = 3, [2] = 4, [3] = 5, [4] = 6}, {[1] = {[1] = '\x3d', [2] = 3, [3] = 4}})
space:upsert({[1] = 3, [2] = 4, [3] = 5, [4] = 6}, {[1] = {[1] = '\x3d', [2] = 3, [3] = 4}})
+ f = function(old, new) return old end
+ space:before_replace(f)
+ space:replace{1,5}
+ space:before_replace(nil, f)
os.exit(0)
]]
@@ -372,11 +376,11 @@ do
test:test("fill and test cat output", function(test_i)
test_i:plan(29)
check_ok(test_i, dir, 'start', 'filler', 0)
- check_ctlcat_xlog(test_i, dir, nil, "---\n", 6)
+ check_ctlcat_xlog(test_i, dir, nil, "---\n", 7)
check_ctlcat_xlog(test_i, dir, "--space=512", "---\n", 6)
check_ctlcat_xlog(test_i, dir, "--space=666", "---\n", 0)
- check_ctlcat_xlog(test_i, dir, "--show-system", "---\n", 9)
- check_ctlcat_xlog(test_i, dir, "--format=json", "\n", 6)
+ check_ctlcat_xlog(test_i, dir, "--show-system", "---\n", 10)
+ check_ctlcat_xlog(test_i, dir, "--format=json", "\n", 7)
check_ctlcat_xlog(test_i, dir, "--format=lua", "\n", 6)
check_ctlcat_xlog(test_i, dir, "--from=3 --to=6 --format=json", "\n", 2)
check_ctlcat_xlog(test_i, dir, "--from=3 --to=6 --format=json --show-system", "\n", 3)
@@ -411,6 +415,10 @@ do
space:update({[1] = 2}, {[1] = {[1] = '\x3d', [2] = 3, [3] = 4}})
space:upsert({[1] = 3, [2] = 4, [3] = 5, [4] = 6}, {[1] = {[1] = '\x3d', [2] = 3, [3] = 4}})
space:upsert({[1] = 3, [2] = 4, [3] = 5, [4] = 6}, {[1] = {[1] = '\x3d', [2] = 3, [3] = 4}})
+ f = function(old, new) return old end
+ space:before_replace(f)
+ space:replace{1,5}
+ space:before_replace(nil, f)
os.exit(0)
]]
create_script(dir, 'filler.lua', filler_code)
--
2.15.2 (Apple Git-101.1)
next prev parent reply other threads:[~2018-09-14 14:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-14 14:36 [PATCH 0/2] fix bodiless requests handling Serge Petrenko
2018-09-14 14:36 ` Serge Petrenko [this message]
2018-09-14 15:37 ` [PATCH 1/2] tarantoolctl: fix cat and play for empty body requests Vladimir Davydov
2018-09-14 14:36 ` [PATCH 2/2] recovery: fix incorrect handling of empty-body requests Serge Petrenko
2018-09-14 16:27 ` Vladimir Davydov
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=99dd15d5748aa49e99f7e98ce63f73dda63d25bc.1536934854.git.sergepetrenko@tarantool.org \
--to=sergepetrenko@tarantool.org \
--cc=tarantool-patches@freelists.org \
--cc=vdavydov.dev@gmail.com \
--subject='Re: [PATCH 1/2] 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