From: Sergey Bronnikov <sergeyb@tarantool.org>
To: sergepetrenko@tarantool.org, tarantool-patches@dev.tarantool.org,
avtikhon@tarantool.org, o.piskunov@tarantool.org
Subject: [Tarantool-patches] [PATCH] Fix flaky test engine/ddl
Date: Fri, 10 Apr 2020 16:27:07 +0300 [thread overview]
Message-ID: <c6e3f4cb6c9425cd37ac91f5a4f5a62d605305b9.1586525094.git.sergeyb@tarantool.org> (raw)
Test was a flaky from the beginning 39d0e4273dde2dbb3e46aea35310379e98e7cc64
Time of building indexes varies from time to time and the problem was due to
abcense of synchronization in index building and checking numbers of these
indexes.
Fixes #4353
---
test/engine/ddl.result | 15 +++++++++------
test/engine/ddl.test.lua | 14 ++++++++------
test/engine/suite.ini | 3 +--
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/test/engine/ddl.result b/test/engine/ddl.result
index 67b22ed9e..6cf429c9b 100644
--- a/test/engine/ddl.result
+++ b/test/engine/ddl.result
@@ -2461,20 +2461,23 @@ ch:get()
---
- true
...
-box.space.test.index.pk:count() == box.space.test.index.sk:count()
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
---
- true
...
-box.space.test.index.pk:count() == box.space.test.index.tk:count()
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
---
- true
...
inspector:cmd("restart server default")
-box.space.test.index.pk:count() == box.space.test.index.sk:count()
+inspector = require('test_run').new()
+---
+...
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
---
- true
...
-box.space.test.index.pk:count() == box.space.test.index.tk:count()
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
---
- true
...
@@ -2482,11 +2485,11 @@ box.snapshot()
---
- ok
...
-box.space.test.index.pk:count() == box.space.test.index.sk:count()
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
---
- true
...
-box.space.test.index.pk:count() == box.space.test.index.tk:count()
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
---
- true
...
diff --git a/test/engine/ddl.test.lua b/test/engine/ddl.test.lua
index e761966d7..57f1beb03 100644
--- a/test/engine/ddl.test.lua
+++ b/test/engine/ddl.test.lua
@@ -976,15 +976,17 @@ _ = fiber.create(function() gen_load() ch:put(true) end)
_ = box.space.test:create_index('tk', {unique = true, parts = {3, 'unsigned'}})
ch:get()
-box.space.test.index.pk:count() == box.space.test.index.sk:count()
-box.space.test.index.pk:count() == box.space.test.index.tk:count()
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
inspector:cmd("restart server default")
-box.space.test.index.pk:count() == box.space.test.index.sk:count()
-box.space.test.index.pk:count() == box.space.test.index.tk:count()
+inspector = require('test_run').new()
+
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
box.snapshot()
-box.space.test.index.pk:count() == box.space.test.index.sk:count()
-box.space.test.index.pk:count() == box.space.test.index.tk:count()
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.sk:count() end)
+inspector:wait_cond(function() return box.space.test.index.pk:count() == box.space.test.index.tk:count() end)
box.space.test:drop()
diff --git a/test/engine/suite.ini b/test/engine/suite.ini
index 5ae12a431..e78b8c261 100644
--- a/test/engine/suite.ini
+++ b/test/engine/suite.ini
@@ -10,5 +10,4 @@ config = engine.cfg
lua_libs = conflict.lua ../box/lua/utils.lua ../box/lua/push.lua
is_parallel = True
pretest_clean = True
-fragile = ddl.test.lua ; gh-4353
- recover_wal.test.lua ; gh-3767
+fragile = recover_wal.test.lua ; gh-3767
--
2.23.0
--
sergeyb@
next reply other threads:[~2020-04-10 13:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-10 13:27 Sergey Bronnikov [this message]
2020-04-11 12:55 ` Serge Petrenko
2020-04-13 13:06 ` Sergey Bronnikov
2020-04-13 8:45 ` Oleg Piskunov
2020-04-15 11:14 ` 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=c6e3f4cb6c9425cd37ac91f5a4f5a62d605305b9.1586525094.git.sergeyb@tarantool.org \
--to=sergeyb@tarantool.org \
--cc=avtikhon@tarantool.org \
--cc=o.piskunov@tarantool.org \
--cc=sergepetrenko@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH] Fix flaky test engine/ddl' \
/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