From: Alexander Turenko <alexander.turenko@tarantool.org> To: tarantool-patches@freelists.org Cc: Alexander Turenko <alexander.turenko@tarantool.org> Subject: [tarantool-patches] [PATCH 3/4] test: increase timeouts in replication/errinj Date: Wed, 10 Apr 2019 16:28:44 +0300 [thread overview] Message-ID: <56ece6aed2cb73f9de94d3cba0cd2c1954a03d30.1554902241.git.alexander.turenko@tarantool.org> (raw) In-Reply-To: <cover.1554902241.git.alexander.turenko@tarantool.org> Needed for parallel running of the test suite. Use default replication_connect_timeout (30 seconds) instead of 0.5 seconds. This don't changes meaning of the test cases. Increase replication_timeout from 0.01 to 0.1. These changes allow to run the test 100 times in 50 parallel jobs successfully. --- test/replication/errinj.result | 8 ++++---- test/replication/errinj.test.lua | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/replication/errinj.result b/test/replication/errinj.result index 2e7d367c7..f04a38c45 100644 --- a/test/replication/errinj.result +++ b/test/replication/errinj.result @@ -408,14 +408,14 @@ errinj.set("ERRINJ_RELAY_EXIT_DELAY", 0) --- - ok ... -box.cfg{replication_timeout = 0.01} +box.cfg{replication_timeout = 0.1} --- ... test_run:cmd("create server replica_timeout with rpl_master=default, script='replication/replica_timeout.lua'") --- - true ... -test_run:cmd("start server replica_timeout with args='0.01 0.5'") +test_run:cmd("start server replica_timeout with args='0.1'") --- - true ... @@ -471,7 +471,7 @@ errinj.set("ERRINJ_RELAY_REPORT_INTERVAL", 0) ... -- Check replica's ACKs don't prevent the master from sending -- heartbeat messages (gh-3160). -test_run:cmd("start server replica_timeout with args='0.009 0.5'") +test_run:cmd("start server replica_timeout with args='0.1'") --- - true ... @@ -489,7 +489,7 @@ box.info.replication[1].upstream.status -- follow --- - follow ... -for i = 0, 15 do fiber.sleep(0.01) if box.info.replication[1].upstream.status ~= 'follow' then break end end +for i = 0, 15 do fiber.sleep(box.cfg.replication_timeout) if box.info.replication[1].upstream.status ~= 'follow' then break end end --- ... box.info.replication[1].upstream.status -- follow diff --git a/test/replication/errinj.test.lua b/test/replication/errinj.test.lua index 32e0be912..53637e248 100644 --- a/test/replication/errinj.test.lua +++ b/test/replication/errinj.test.lua @@ -169,10 +169,10 @@ test_run:cmd("stop server replica") test_run:cmd("cleanup server replica") errinj.set("ERRINJ_RELAY_EXIT_DELAY", 0) -box.cfg{replication_timeout = 0.01} +box.cfg{replication_timeout = 0.1} test_run:cmd("create server replica_timeout with rpl_master=default, script='replication/replica_timeout.lua'") -test_run:cmd("start server replica_timeout with args='0.01 0.5'") +test_run:cmd("start server replica_timeout with args='0.1'") test_run:cmd("switch replica_timeout") fiber = require('fiber') @@ -198,13 +198,13 @@ errinj.set("ERRINJ_RELAY_REPORT_INTERVAL", 0) -- Check replica's ACKs don't prevent the master from sending -- heartbeat messages (gh-3160). -test_run:cmd("start server replica_timeout with args='0.009 0.5'") +test_run:cmd("start server replica_timeout with args='0.1'") test_run:cmd("switch replica_timeout") fiber = require('fiber') while box.info.replication[1].upstream.status ~= 'follow' do fiber.sleep(0.0001) end box.info.replication[1].upstream.status -- follow -for i = 0, 15 do fiber.sleep(0.01) if box.info.replication[1].upstream.status ~= 'follow' then break end end +for i = 0, 15 do fiber.sleep(box.cfg.replication_timeout) if box.info.replication[1].upstream.status ~= 'follow' then break end end box.info.replication[1].upstream.status -- follow test_run:cmd("switch default") -- 2.20.1
next prev parent reply other threads:[~2019-04-10 13:28 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-10 13:28 [tarantool-patches] [PATCH 0/4] *** test: replication/ fixes for parallel run *** Alexander Turenko 2019-04-10 13:28 ` [tarantool-patches] [PATCH 1/4] test: allow to run replication/misc multiple times Alexander Turenko 2019-04-10 13:28 ` [tarantool-patches] [PATCH 2/4] test: increase timeouts in replication/misc Alexander Turenko 2019-04-10 13:28 ` Alexander Turenko [this message] 2019-04-10 13:28 ` [tarantool-patches] [PATCH 4/4] test: wait for xlog/snap/log file changes Alexander Turenko 2019-04-10 13:43 ` [tarantool-patches] Re: [PATCH 0/4] *** test: replication/ fixes for parallel run *** 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=56ece6aed2cb73f9de94d3cba0cd2c1954a03d30.1554902241.git.alexander.turenko@tarantool.org \ --to=alexander.turenko@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH 3/4] test: increase timeouts in replication/errinj' \ /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