<HTML><BODY><p>I am going to fix it as soon as i will be able to test it, as far as it<br>doesn't seem convenient to fix something i can't reproduce. For now i<br>just brought the patch to the current state.</p><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Четверг, 21 ноября 2019, 2:01 +03:00 от Vladislav Shpilevoy <v.shpilevoy@tarantool.org>:<br>
<br>
<div id="">
<div class="js-helper js-readmsg-msg">
<style type="text/css"></style>
<div>
<div id="style_15742908621053190153_BODY">Hm. So you are not going to fix the flaky error I mentioned<br>
in the previous thread about this commit?<br>
<br>
Seems like it is also about 'conditions which need time to be<br>
satisfied'.<br>
<br>
On 20/11/2019 23:47, Ilya Kosarev wrote:<br>
> There were some pass conditions in quorum test which could take some<br>
> time to be satisfied. Now they are wrapped using test_run:wait_cond to<br>
> make the test stable.<br>
> <br>
> Part of #4586<br>
> ---<br>
> test/replication/quorum.result | 30 +++++++++++++++++-------------<br>
> test/replication/quorum.test.lua | 18 +++++++++---------<br>
> 2 files changed, 26 insertions(+), 22 deletions(-)<br>
> <br>
> diff --git a/test/replication/quorum.result b/test/replication/quorum.result<br>
> index ff5fa0150..12604c8de 100644<br>
> --- a/test/replication/quorum.result<br>
> +++ b/test/replication/quorum.result<br>
> @@ -115,15 +115,15 @@ box.info.status -- running<br>
> - running<br>
> ...<br>
> -- Check that the replica follows all masters.<br>
> -box.info.id == 1 or box.info.replication[1].upstream.status == 'follow'<br>
> +box.info.id == 1 or test_run:wait_cond(function() return box.info.replication[1].upstream.status == 'follow' end, 20)<br>
> ---<br>
> - true<br>
> ...<br>
> -box.info.id == 2 or box.info.replication[2].upstream.status == 'follow'<br>
> +box.info.id == 2 or test_run:wait_cond(function() return box.info.replication[2].upstream.status == 'follow' end, 20)<br>
> ---<br>
> - true<br>
> ...<br>
> -box.info.id == 3 or box.info.replication[3].upstream.status == 'follow'<br>
> +box.info.id == 3 or test_run:wait_cond(function() return box.info.replication[3].upstream.status == 'follow' end, 20)<br>
> ---<br>
> - true<br>
> ...<br>
> @@ -149,6 +149,10 @@ test_run:cmd('stop server quorum1')<br>
> ---<br>
> - true<br>
> ...<br>
> +test_run:wait_cond(function() return box.space.test.index.primary ~= nil end, 20)<br>
> +---<br>
> +- true<br>
> +...<br>
> for i = 1, 100 do box.space.test:insert{i} end<br>
> ---<br>
> ...<br>
> @@ -166,9 +170,9 @@ test_run:cmd('switch quorum1')<br>
> ---<br>
> - true<br>
> ...<br>
> -box.space.test:count() -- 100<br>
> +test_run:wait_cond(function() return box.space.test:count() == 100 end, 20)<br>
> ---<br>
> -- 100<br>
> +- true<br>
> ...<br>
> -- Rebootstrap one node of the cluster and check that others follow.<br>
> -- Note, due to ERRINJ_RELAY_TIMEOUT there is a substantial delay<br>
> @@ -197,9 +201,9 @@ test_run:cmd('switch quorum1')<br>
> - true<br>
> ...<br>
> test_run:cmd('restart server quorum1 with cleanup=1, args="0.1 0.5"')<br>
> -box.space.test:count() -- 100<br>
> +test_run:wait_cond(function() return box.space.test:count() == 100 end, 20)<br>
> ---<br>
> -- 100<br>
> +- true<br>
> ...<br>
> -- The rebootstrapped replica will be assigned id = 4,<br>
> -- because ids 1..3 are busy.<br>
> @@ -207,11 +211,9 @@ test_run:cmd('switch quorum2')<br>
> ---<br>
> - true<br>
> ...<br>
> -fiber = require('fiber')<br>
> ----<br>
> -...<br>
> -while box.info.replication[4].upstream.status ~= 'follow' do fiber.sleep(0.001) end<br>
> +test_run:wait_cond(function() return box.info.replication[4].upstream.status == 'follow' end, 20)<br>
> ---<br>
> +- true<br>
> ...<br>
> box.info.replication[4].upstream.status<br>
> ---<br>
> @@ -221,11 +223,13 @@ test_run:cmd('switch quorum3')<br>
> ---<br>
> - true<br>
> ...<br>
> -fiber = require('fiber')<br>
> +test_run:wait_cond(function() return box.info.replication ~= nil end, 20)<br>
> ---<br>
> +- true<br>
> ...<br>
> -while box.info.replication[4].upstream.status ~= 'follow' do fiber.sleep(0.001) end<br>
> +test_run:wait_cond(function() return box.info.replication[4].upstream.status == 'follow' end, 20)<br>
> ---<br>
> +- true<br>
> ...<br>
> box.info.replication[4].upstream.status<br>
> ---<br>
> diff --git a/test/replication/quorum.test.lua b/test/replication/quorum.test.lua<br>
> index 98febb367..be23200d3 100644<br>
> --- a/test/replication/quorum.test.lua<br>
> +++ b/test/replication/quorum.test.lua<br>
> @@ -47,9 +47,9 @@ box.info.ro -- false<br>
> box.info.status -- running<br>
> <br>
> -- Check that the replica follows all masters.<br>
> -box.info.id == 1 or box.info.replication[1].upstream.status == 'follow'<br>
> -box.info.id == 2 or box.info.replication[2].upstream.status == 'follow'<br>
> -box.info.id == 3 or box.info.replication[3].upstream.status == 'follow'<br>
> +box.info.id == 1 or test_run:wait_cond(function() return box.info.replication[1].upstream.status == 'follow' end, 20)<br>
> +box.info.id == 2 or test_run:wait_cond(function() return box.info.replication[2].upstream.status == 'follow' end, 20)<br>
> +box.info.id == 3 or test_run:wait_cond(function() return box.info.replication[3].upstream.status == 'follow' end, 20)<br>
> <br>
> -- Check that box.cfg() doesn't return until the instance<br>
> -- catches up with all configured replicas.<br>
> @@ -59,13 +59,14 @@ test_run:cmd('switch quorum2')<br>
> box.error.injection.set("ERRINJ_RELAY_TIMEOUT", 0.001)<br>
> test_run:cmd('stop server quorum1')<br>
> <br>
> +test_run:wait_cond(function() return box.space.test.index.primary ~= nil end, 20)<br>
> for i = 1, 100 do box.space.test:insert{i} end<br>
> fiber = require('fiber')<br>
> fiber.sleep(0.1)<br>
> <br>
> test_run:cmd('start server quorum1 with args="0.1 0.5"')<br>
> test_run:cmd('switch quorum1')<br>
> -box.space.test:count() -- 100<br>
> +test_run:wait_cond(function() return box.space.test:count() == 100 end, 20)<br>
> <br>
> -- Rebootstrap one node of the cluster and check that others follow.<br>
> -- Note, due to ERRINJ_RELAY_TIMEOUT there is a substantial delay<br>
> @@ -81,17 +82,16 @@ box.snapshot()<br>
> test_run:cmd('switch quorum1')<br>
> test_run:cmd('restart server quorum1 with cleanup=1, args="0.1 0.5"')<br>
> <br>
> -box.space.test:count() -- 100<br>
> +test_run:wait_cond(function() return box.space.test:count() == 100 end, 20)<br>
> <br>
> -- The rebootstrapped replica will be assigned id = 4,<br>
> -- because ids 1..3 are busy.<br>
> test_run:cmd('switch quorum2')<br>
> -fiber = require('fiber')<br>
> -while box.info.replication[4].upstream.status ~= 'follow' do fiber.sleep(0.001) end<br>
> +test_run:wait_cond(function() return box.info.replication[4].upstream.status == 'follow' end, 20)<br>
> box.info.replication[4].upstream.status<br>
> test_run:cmd('switch quorum3')<br>
> -fiber = require('fiber')<br>
> -while box.info.replication[4].upstream.status ~= 'follow' do fiber.sleep(0.001) end<br>
> +test_run:wait_cond(function() return box.info.replication ~= nil end, 20)<br>
> +test_run:wait_cond(function() return box.info.replication[4].upstream.status == 'follow' end, 20)<br>
> box.info.replication[4].upstream.status<br>
> <br>
> -- Cleanup.<br>
> <br>
</div>
</div>
</div>
</div>
</blockquote>
<br>
<br>-- <br>Ilya Kosarev<br></BODY></HTML>