From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: tarantool-patches@dev.tarantool.org, alexander.turenko@tarantool.org
Subject: [Tarantool-patches] [PATCH 1/1] test: fix flaky box/gh-4627-session-use-after-free
Date: Tue, 3 Dec 2019 01:05:30 +0100 [thread overview]
Message-ID: <f577002be9c5dc04530e7d947413ebd930bc2227.1575331483.git.v.shpilevoy@tarantool.org> (raw)
The problem was in that the test uses the global trigger
box.session.on_disconnect() to set a global variable by one
connection. But test-run can do multiple connects/reconnects to
the same instance. That led to multiple invocations of
box.session.on_disconnect(), which could override the global
variable in unexpected ways and moments.
The patch makes only one session execute that trigger.
Probably related to https://github.com/tarantool/test-run/issues/46
Follow up #4627
---
Branch: https://github.com/tarantool/tarantool/tree/gerold103/session-flaky-test
.../box/gh-4627-session-use-after-free.result | 28 +++++++++++++++++++
.../gh-4627-session-use-after-free.test.lua | 20 +++++++++++++
2 files changed, 48 insertions(+)
diff --git a/test/box/gh-4627-session-use-after-free.result b/test/box/gh-4627-session-use-after-free.result
index 5e5c154b9..33e5a7af1 100644
--- a/test/box/gh-4627-session-use-after-free.result
+++ b/test/box/gh-4627-session-use-after-free.result
@@ -20,6 +20,21 @@ fiber = require('fiber')
| ---
| ...
+box.schema.user.grant('guest', 'execute', 'universe')
+ | ---
+ | ...
+
+-- This is a workaround for flakiness of the test
+-- appearing when another test tries to connect to
+-- this one. By setting a flag for only one
+-- session, others won't interfere in
+-- session.on_disconnect().
+function enable_on_disconnect() \
+ box.session.storage.is_enabled = true \
+end
+ | ---
+ | ...
+
sid_before_yield = nil
| ---
| ...
@@ -27,6 +42,9 @@ sid_after_yield = nil
| ---
| ...
func = box.session.on_disconnect(function() \
+ if not box.session.storage.is_enabled then \
+ return \
+ end \
sid_before_yield = box.session.id() \
fiber.yield() \
sid_after_yield = box.session.id() \
@@ -37,6 +55,12 @@ end)
connection = net_box.connect(box.cfg.listen)
| ---
| ...
+-- Connections, not related to this one, won't
+-- call this function, and therefore won't do
+-- anything in session.on_disconnect() trigger.
+connection:call('enable_on_disconnect')
+ | ---
+ | ...
connection:ping()
| ---
| - true
@@ -58,3 +82,7 @@ sid_after_yield == sid_before_yield and sid_after_yield ~= 0 or \
box.session.on_disconnect(nil, func)
| ---
| ...
+
+box.schema.user.revoke('guest', 'execute', 'universe')
+ | ---
+ | ...
diff --git a/test/box/gh-4627-session-use-after-free.test.lua b/test/box/gh-4627-session-use-after-free.test.lua
index 70624a96a..1b2ebfdc4 100644
--- a/test/box/gh-4627-session-use-after-free.test.lua
+++ b/test/box/gh-4627-session-use-after-free.test.lua
@@ -15,15 +15,33 @@
net_box = require('net.box')
fiber = require('fiber')
+box.schema.user.grant('guest', 'execute', 'universe')
+
+-- This is a workaround for flakiness of the test
+-- appearing when another test tries to connect to
+-- this one. By setting a flag for only one
+-- session, others won't interfere in
+-- session.on_disconnect().
+function enable_on_disconnect() \
+ box.session.storage.is_enabled = true \
+end
+
sid_before_yield = nil
sid_after_yield = nil
func = box.session.on_disconnect(function() \
+ if not box.session.storage.is_enabled then \
+ return \
+ end \
sid_before_yield = box.session.id() \
fiber.yield() \
sid_after_yield = box.session.id() \
end)
connection = net_box.connect(box.cfg.listen)
+-- Connections, not related to this one, won't
+-- call this function, and therefore won't do
+-- anything in session.on_disconnect() trigger.
+connection:call('enable_on_disconnect')
connection:ping()
connection:close()
@@ -33,3 +51,5 @@ sid_after_yield == sid_before_yield and sid_after_yield ~= 0 or \
{sid_after_yield, sid_before_yield}
box.session.on_disconnect(nil, func)
+
+box.schema.user.revoke('guest', 'execute', 'universe')
--
2.21.0 (Apple Git-122.2)
next reply other threads:[~2019-12-03 0:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 0:05 Vladislav Shpilevoy [this message]
2019-12-04 11:35 ` Alexander Turenko
2019-12-05 20:42 ` Vladislav Shpilevoy
2019-12-05 22:53 ` Alexander Turenko
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=f577002be9c5dc04530e7d947413ebd930bc2227.1575331483.git.v.shpilevoy@tarantool.org \
--to=v.shpilevoy@tarantool.org \
--cc=alexander.turenko@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 1/1] test: fix flaky box/gh-4627-session-use-after-free' \
/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