Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Kirill Yukhin <kyukhin@tarantool.org>, Igor Munkin <imun@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org,
	Alexander Turenko <alexander.turenko@tarantool.org>
Subject: [Tarantool-patches] [PATCH v1] test: fix flaky box/on_shutdown.test.lua on asan
Date: Mon, 31 Aug 2020 11:15:06 +0300	[thread overview]
Message-ID: <f599e2dbba1ad2e7d4bbc6915ad2f467a30eb303.1598861611.git.avtikhon@tarantool.org> (raw)

Found that box/on_shutdown.test.lua test fails on asan build with:

  2020-08-26 09:04:06.750 [42629] main/102/on_shutdown [string "_ = box.ctl.on_shutdown(function() log.warn("..."]:1 W> on_shutdown 5
  Starting instance proxy...
  Run console at unix/:/tnt/test/var/001_box/proxy.control
  Start failed: builtin/box/console.lua:865: failed to create server unix/:/tnt/test/var/001_box/proxy.control: Address already in use

It happened on ASAN build, because server stop routine

  test-run/lib/preprocessor.py:TestState.server_stop() ->
    test-run/lib/tarantool_server.py:TarantoolServer.stop()

needs to free the proxy.control socket created by

  test-run/lib/preprocessor.py:TestState.server_start() ->
    tarantoolctl:process_local()

On some builds like ASAN server stop routine needs more time to free
the 'proxy.control' socket. So instead of time delay before server
restart need to use garbage collector to be sure that it will be freed.

Closes #5260
Part of #4360
---

Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-5260-on-shutdown-test
Issue: https://github.com/tarantool/tarantool/issues/5260
Issue: https://github.com/tarantool/tarantool/issues/4360

 test/box/on_shutdown.result   | 7 ++++++-
 test/box/on_shutdown.skipcond | 7 -------
 test/box/on_shutdown.test.lua | 6 +++++-
 3 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 test/box/on_shutdown.skipcond

diff --git a/test/box/on_shutdown.result b/test/box/on_shutdown.result
index ccbdf45cb..cf5c36c8d 100644
--- a/test/box/on_shutdown.result
+++ b/test/box/on_shutdown.result
@@ -133,8 +133,13 @@ test_run:eval("test", "_ = fiber.new(function() os.exit() while true do end end)
 ---
 - []
 ...
-fiber.sleep(0.1)
+-- On some builds like ASAN server stop routine needs more time to free
+-- the 'proxy.control' socket created by tarantoolctl:process_local(),
+-- check gh-5260. So instead of time delay before server restart need
+-- to use garbage collector to be sure that it will be freed.
+collectgarbage('collect')
 ---
+- 0
 ...
 -- The server should be already stopped by os.exit(),
 -- but start doesn't work without a prior call to stop.
diff --git a/test/box/on_shutdown.skipcond b/test/box/on_shutdown.skipcond
deleted file mode 100644
index e46fd1088..000000000
--- a/test/box/on_shutdown.skipcond
+++ /dev/null
@@ -1,7 +0,0 @@
-import os
-
-# Disabled at ASAN build due to issue #4360.
-if os.getenv("ASAN") == 'ON':
-    self.skip = 1
-
-# vim: set ft=python:
diff --git a/test/box/on_shutdown.test.lua b/test/box/on_shutdown.test.lua
index 2a9143404..5437443b3 100644
--- a/test/box/on_shutdown.test.lua
+++ b/test/box/on_shutdown.test.lua
@@ -54,7 +54,11 @@ test_run:cmd("switch default")
 -- instance to make sure test_run doesn't lose connection to the
 -- shutting down instance.
 test_run:eval("test", "_ = fiber.new(function() os.exit() while true do end end)")
-fiber.sleep(0.1)
+-- On some builds like ASAN server stop routine needs more time to free
+-- the 'proxy.control' socket created by tarantoolctl:process_local(),
+-- check gh-5260. So instead of time delay before server restart need
+-- to use garbage collector to be sure that it will be freed.
+collectgarbage('collect')
 -- The server should be already stopped by os.exit(),
 -- but start doesn't work without a prior call to stop.
 test_run:cmd("stop server test")
-- 
2.17.1

             reply	other threads:[~2020-08-31  8:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-31  8:15 Alexander V. Tikhonov [this message]
2020-09-09 12:04 ` Igor Munkin
  -- strict thread matches above, loose matches on Subject: below --
2020-08-26 14:24 Alexander V. Tikhonov

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=f599e2dbba1ad2e7d4bbc6915ad2f467a30eb303.1598861611.git.avtikhon@tarantool.org \
    --to=avtikhon@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=imun@tarantool.org \
    --cc=kyukhin@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v1] test: fix flaky box/on_shutdown.test.lua on asan' \
    /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