From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 208A54696C5 for ; Tue, 26 Nov 2019 09:21:56 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Tue, 26 Nov 2019 09:21:42 +0300 Message-Id: <3165b302d32cf398897643bb2ac37bd443a0b2aa.1574749278.git.avtikhon@tarantool.org> In-Reply-To: <1c42ad20160f47d942cab405ce9896d6d31cc05f.1574749278.git.avtikhon@tarantool.org> References: <1c42ad20160f47d942cab405ce9896d6d31cc05f.1574749278.git.avtikhon@tarantool.org> In-Reply-To: <1c42ad20160f47d942cab405ce9896d6d31cc05f.1574749278.git.avtikhon@tarantool.org> References: <1c42ad20160f47d942cab405ce9896d6d31cc05f.1574749278.git.avtikhon@tarantool.org> Subject: [Tarantool-patches] [PATCH v1 06/12] test: increase timeouts in replication/errinj List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kirill Yukhin Cc: tarantool-patches@dev.tarantool.org From: Alexander Turenko 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. (cherry picked from commit e257eb27b95c2d3c1cb0d299b4bd35afa17525fe) --- 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.17.1