[Tarantool-patches] [PATCH] Fix flaky test engine/ddl

[Serge Petrenko]

Hi! Thanks for the patch!


> 10 апр. 2020 г., в 16:27, Sergey Bronnikov <sergeyb at tarantool.org> написал(а):
> 
> 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
> ---

Please attach links to the issue and branch after `---` next time.

> 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)

I think the check can’t fail after `box.snapshot()` even without wait_cond().
You’ve already waited for the index to build right before `box.snapshot()`.
It’ s better to leave the last 2 checks without wait_cond to emphasize that
nothing could happen during `box.snapshot()`.

> 
> 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@


--
Serge Petrenko
sergepetrenko at tarantool.org