From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 6604429BED for ; Mon, 1 Apr 2019 10:13:39 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S_U2F0YP1o17 for ; Mon, 1 Apr 2019 10:13:39 -0400 (EDT) Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [217.69.128.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id DF44F27CD9 for ; Mon, 1 Apr 2019 10:13:38 -0400 (EDT) From: avtikhon Subject: [tarantool-patches] [PATCH v1 1/6] Update the timeouts, set to use the default value Date: Mon, 1 Apr 2019 17:13:30 +0300 Message-Id: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: Alexander Turenko Cc: avtikhon , tarantool-patches@freelists.org From: avtikhon --- test/replication/autobootstrap.lua | 2 +- test/replication/autobootstrap_guest.lua | 2 +- test/replication/ddl.lua | 2 +- test/replication/errinj.result | 2 +- test/replication/errinj.test.lua | 2 +- test/replication/force_recovery.result | 2 +- test/replication/force_recovery.test.lua | 2 +- test/replication/gc.result | 42 ++++++++++++------------ test/replication/gc.test.lua | 42 ++++++++++++------------ test/replication/master.lua | 2 +- test/replication/master_quorum.lua | 2 +- test/replication/on_replace.lua | 2 +- test/replication/quorum.lua | 2 +- test/replication/quorum.result | 2 +- test/replication/quorum.test.lua | 2 +- test/replication/rebootstrap.lua | 2 +- test/replication/rebootstrap.result | 2 +- test/replication/rebootstrap.test.lua | 2 +- test/replication/replica.lua | 4 +-- test/replication/replica_auth.lua | 2 +- test/replication/replica_quorum.lua | 2 +- test/replication/replica_timeout.lua | 2 +- test/replication/sync.result | 14 ++++---- test/replication/sync.test.lua | 14 ++++---- 24 files changed, 77 insertions(+), 77 deletions(-) diff --git a/test/replication/autobootstrap.lua b/test/replication/autobootstrap.lua index 856b36e66..ef8b149e9 100644 --- a/test/replication/autobootstrap.lua +++ b/test/replication/autobootstrap.lua @@ -6,7 +6,7 @@ local USER = 'cluster' local PASSWORD = 'somepassword' local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 +local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 60.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) diff --git a/test/replication/autobootstrap_guest.lua b/test/replication/autobootstrap_guest.lua index d7176ae5b..78cfd381b 100644 --- a/test/replication/autobootstrap_guest.lua +++ b/test/replication/autobootstrap_guest.lua @@ -6,7 +6,7 @@ local INSTANCE_ID = string.match(arg[0], "%d") local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 +local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 60.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) diff --git a/test/replication/ddl.lua b/test/replication/ddl.lua index 72cf1db69..ac889c929 100644 --- a/test/replication/ddl.lua +++ b/test/replication/ddl.lua @@ -7,7 +7,7 @@ local PASSWORD = 'somepassword' local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 +local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 60.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) diff --git a/test/replication/errinj.result b/test/replication/errinj.result index 2e7d367c7..0f3096704 100644 --- a/test/replication/errinj.result +++ b/test/replication/errinj.result @@ -43,7 +43,7 @@ test_run:cmd("setopt delimiter ';'") ... -- vinyl does not support index.len() so we use index.count() instead function wait_repl(cnt) - for i = 1, 20 do + for i = 1, 200 do if s.index[0]:count() >= cnt then return true end diff --git a/test/replication/errinj.test.lua b/test/replication/errinj.test.lua index 32e0be912..e9965483e 100644 --- a/test/replication/errinj.test.lua +++ b/test/replication/errinj.test.lua @@ -18,7 +18,7 @@ s = box.space.test test_run:cmd("setopt delimiter ';'") -- vinyl does not support index.len() so we use index.count() instead function wait_repl(cnt) - for i = 1, 20 do + for i = 1, 200 do if s.index[0]:count() >= cnt then return true end diff --git a/test/replication/force_recovery.result b/test/replication/force_recovery.result index f50452858..7d1beea47 100644 --- a/test/replication/force_recovery.result +++ b/test/replication/force_recovery.result @@ -30,7 +30,7 @@ test_run:cmd("stop server test") --- - true ... -test_run:wait_cond(function() return box.info.replication[2].downstream.status == 'stopped' end, 10) +test_run:wait_cond(function() return box.info.replication[2].downstream.status == 'stopped' end) --- - true ... diff --git a/test/replication/force_recovery.test.lua b/test/replication/force_recovery.test.lua index 54307814b..9ac5dadf5 100644 --- a/test/replication/force_recovery.test.lua +++ b/test/replication/force_recovery.test.lua @@ -14,7 +14,7 @@ test_run:cmd("start server test") -- Stop the replica and wait for the relay thread to exit. test_run:cmd("stop server test") -test_run:wait_cond(function() return box.info.replication[2].downstream.status == 'stopped' end, 10) +test_run:wait_cond(function() return box.info.replication[2].downstream.status == 'stopped' end) -- Delete an xlog file that is needed by the replica. box.snapshot() diff --git a/test/replication/gc.result b/test/replication/gc.result index 5b7057adf..ccf11fe8e 100644 --- a/test/replication/gc.result +++ b/test/replication/gc.result @@ -34,14 +34,14 @@ test_run:cmd("setopt delimiter ';'") function wait_gc(n) return test_run:wait_cond(function() return #box.info.gc().checkpoints == n - end, 10) + end) or box.info.gc() end; --- ... -function wait_xlog(n, timeout) +function wait_xlog(n) return test_run:wait_cond(function() return #fio.glob('./master/*.xlog') == n - end, 10) + end) or fio.glob('./master/*.xlog') end; --- ... @@ -117,7 +117,7 @@ test_run:cmd("switch replica") --- - true ... -test_run:wait_cond(function() return box.space.test:count() == 200 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 200 end) --- - true ... @@ -131,11 +131,11 @@ test_run:cmd("switch default") ... -- Check that garbage collection removed the snapshot once -- the replica released the corresponding checkpoint. -wait_gc(1) or box.info.gc() +wait_gc(1) --- - true ... -wait_xlog(1) or fio.listdir('./master') -- Make sure the replica will not receive data until +wait_xlog(1) --- - true ... @@ -168,11 +168,11 @@ box.snapshot() --- - ok ... -wait_gc(1) or box.info.gc() +wait_gc(1) --- - true ... -wait_xlog(2) or fio.listdir('./master') +wait_xlog(2) --- - true ... @@ -187,7 +187,7 @@ test_run:cmd("switch replica") --- - true ... -test_run:wait_cond(function() return box.space.test:count() == 300 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 300 end) --- - true ... @@ -201,11 +201,11 @@ test_run:cmd("switch default") ... -- Now garbage collection should resume and delete files left -- from the old checkpoint. -wait_gc(1) or box.info.gc() +wait_gc(1) --- - true ... -wait_xlog(0) or fio.listdir('./master') +wait_xlog(0) --- - true ... @@ -244,11 +244,11 @@ fiber.sleep(0.1) -- wait for master to relay data -- Garbage collection must not delete the old xlog file -- because it is still needed by the replica, but remove -- the old snapshot. -wait_gc(1) or box.info.gc() +wait_gc(1) --- - true ... -wait_xlog(2) or fio.listdir('./master') +wait_xlog(2) --- - true ... @@ -271,7 +271,7 @@ test_run:cmd("switch replica") --- - true ... -test_run:wait_cond(function() return box.space.test:count() == 310 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 310 end) --- - true ... @@ -284,11 +284,11 @@ test_run:cmd("switch default") - true ... -- Now it's safe to drop the old xlog. -wait_gc(1) or box.info.gc() +wait_gc(1) --- - true ... -wait_xlog(1) or fio.listdir('./master') +wait_xlog(1) --- - true ... @@ -320,11 +320,11 @@ box.snapshot() --- - ok ... -wait_gc(1) or box.info.gc() +wait_gc(1) --- - true ... -wait_xlog(2) or fio.listdir('./master') +wait_xlog(2) --- - true ... @@ -333,11 +333,11 @@ wait_xlog(2) or fio.listdir('./master') test_run:cleanup_cluster() --- ... -wait_gc(1) or box.info.gc() +wait_gc(1) --- - true ... -wait_xlog(1) or fio.listdir('./master') +wait_xlog(1) --- - true ... @@ -442,7 +442,7 @@ box.snapshot() --- - ok ... -wait_xlog(0, 10) or fio.listdir('./master') +wait_xlog(0) or fio.listdir('./master') --- - true ... diff --git a/test/replication/gc.test.lua b/test/replication/gc.test.lua index a92a6ed7e..64e9d82fe 100644 --- a/test/replication/gc.test.lua +++ b/test/replication/gc.test.lua @@ -15,12 +15,12 @@ test_run:cmd("setopt delimiter ';'") function wait_gc(n) return test_run:wait_cond(function() return #box.info.gc().checkpoints == n - end, 10) + end) or box.info.gc() end; -function wait_xlog(n, timeout) +function wait_xlog(n) return test_run:wait_cond(function() return #fio.glob('./master/*.xlog') == n - end, 10) + end) or fio.glob('./master/*.xlog') end; test_run:cmd("setopt delimiter ''"); @@ -63,14 +63,14 @@ test_run:cmd("start server replica") -- bootstrapped from, the replica should still receive all -- data from the master. Check it. test_run:cmd("switch replica") -test_run:wait_cond(function() return box.space.test:count() == 200 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 200 end) box.space.test:count() test_run:cmd("switch default") -- Check that garbage collection removed the snapshot once -- the replica released the corresponding checkpoint. -wait_gc(1) or box.info.gc() -wait_xlog(1) or fio.listdir('./master') -- Make sure the replica will not receive data until +wait_gc(1) +wait_xlog(1) -- we test garbage collection. box.error.injection.set("ERRINJ_RELAY_SEND_DELAY", true) @@ -86,8 +86,8 @@ box.snapshot() -- Invoke garbage collection. Check that it doesn't remove -- xlogs needed by the replica. box.snapshot() -wait_gc(1) or box.info.gc() -wait_xlog(2) or fio.listdir('./master') +wait_gc(1) +wait_xlog(2) -- Resume replication so that the replica catches -- up quickly. @@ -95,14 +95,14 @@ box.error.injection.set("ERRINJ_RELAY_SEND_DELAY", false) -- Check that the replica received all data from the master. test_run:cmd("switch replica") -test_run:wait_cond(function() return box.space.test:count() == 300 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 300 end) box.space.test:count() test_run:cmd("switch default") -- Now garbage collection should resume and delete files left -- from the old checkpoint. -wait_gc(1) or box.info.gc() -wait_xlog(0) or fio.listdir('./master') +wait_gc(1) +wait_xlog(0) -- -- Check that the master doesn't delete xlog files sent to the -- replica until it receives a confirmation that the data has @@ -120,8 +120,8 @@ fiber.sleep(0.1) -- wait for master to relay data -- Garbage collection must not delete the old xlog file -- because it is still needed by the replica, but remove -- the old snapshot. -wait_gc(1) or box.info.gc() -wait_xlog(2) or fio.listdir('./master') +wait_gc(1) +wait_xlog(2) test_run:cmd("switch replica") -- Unblock the replica and break replication. box.error.injection.set("ERRINJ_WAL_DELAY", false) @@ -130,12 +130,12 @@ box.cfg{replication = {}} test_run:cmd("restart server replica") -- Wait for the replica to catch up. test_run:cmd("switch replica") -test_run:wait_cond(function() return box.space.test:count() == 310 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 310 end) box.space.test:count() test_run:cmd("switch default") -- Now it's safe to drop the old xlog. -wait_gc(1) or box.info.gc() -wait_xlog(1) or fio.listdir('./master') +wait_gc(1) +wait_xlog(1) -- Stop the replica. test_run:cmd("stop server replica") test_run:cmd("cleanup server replica") @@ -149,14 +149,14 @@ _ = s:auto_increment{} box.snapshot() _ = s:auto_increment{} box.snapshot() -wait_gc(1) or box.info.gc() -wait_xlog(2) or fio.listdir('./master') +wait_gc(1) +wait_xlog(2) -- The xlog should only be deleted after the replica -- is unregistered. test_run:cleanup_cluster() -wait_gc(1) or box.info.gc() -wait_xlog(1) or fio.listdir('./master') +wait_gc(1) +wait_xlog(1) -- -- Test that concurrent invocation of the garbage collector works fine. -- @@ -202,7 +202,7 @@ wait_xlog(3) or fio.listdir('./master') -- all xlog files are removed. test_run:cleanup_cluster() box.snapshot() -wait_xlog(0, 10) or fio.listdir('./master') +wait_xlog(0) or fio.listdir('./master') -- Restore the config. box.cfg{replication = {}} diff --git a/test/replication/master.lua b/test/replication/master.lua index 9b96b7891..340b9cc81 100644 --- a/test/replication/master.lua +++ b/test/replication/master.lua @@ -3,7 +3,7 @@ os = require('os') box.cfg({ listen = os.getenv("LISTEN"), memtx_memory = 107374182, - replication_connect_timeout = 0.5, + replication_connect_timeout = 100, replication_timeout = 0.1 }) diff --git a/test/replication/master_quorum.lua b/test/replication/master_quorum.lua index 05272ac5e..e00f1f932 100644 --- a/test/replication/master_quorum.lua +++ b/test/replication/master_quorum.lua @@ -6,7 +6,7 @@ local INSTANCE_ID = string.match(arg[0], "%d") local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 +local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 60.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) diff --git a/test/replication/on_replace.lua b/test/replication/on_replace.lua index 40c12a9ea..93544afbe 100644 --- a/test/replication/on_replace.lua +++ b/test/replication/on_replace.lua @@ -7,7 +7,7 @@ local PASSWORD = 'somepassword' local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 +local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 60.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) diff --git a/test/replication/quorum.lua b/test/replication/quorum.lua index f61c8748f..82f432b2d 100644 --- a/test/replication/quorum.lua +++ b/test/replication/quorum.lua @@ -6,7 +6,7 @@ local INSTANCE_ID = string.match(arg[0], "%d") local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 +local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 60.0 local function instance_uri(instance_id) --return 'localhost:'..(3310 + instance_id) diff --git a/test/replication/quorum.result b/test/replication/quorum.result index ff5fa0150..4ad7483b1 100644 --- a/test/replication/quorum.result +++ b/test/replication/quorum.result @@ -158,7 +158,7 @@ fiber = require('fiber') fiber.sleep(0.1) --- ... -test_run:cmd('start server quorum1 with args="0.1 0.5"') +test_run:cmd('start server quorum1 with args="0.1 0.5"') --- - true ... diff --git a/test/replication/quorum.test.lua b/test/replication/quorum.test.lua index 98febb367..777f8ef7c 100644 --- a/test/replication/quorum.test.lua +++ b/test/replication/quorum.test.lua @@ -63,7 +63,7 @@ for i = 1, 100 do box.space.test:insert{i} end fiber = require('fiber') fiber.sleep(0.1) -test_run:cmd('start server quorum1 with args="0.1 0.5"') +test_run:cmd('start server quorum1 with args="0.1 0.5"') test_run:cmd('switch quorum1') box.space.test:count() -- 100 diff --git a/test/replication/rebootstrap.lua b/test/replication/rebootstrap.lua index 3e7d8f062..472dbe453 100644 --- a/test/replication/rebootstrap.lua +++ b/test/replication/rebootstrap.lua @@ -6,7 +6,7 @@ local INSTANCE_ID = string.match(arg[0], "%d") local SOCKET_DIR = require('fio').cwd() local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 +local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 60.0 local function instance_uri(instance_id) return SOCKET_DIR..'/rebootstrap'..instance_id..'.sock'; diff --git a/test/replication/rebootstrap.result b/test/replication/rebootstrap.result index ea390c19f..10952408b 100644 --- a/test/replication/rebootstrap.result +++ b/test/replication/rebootstrap.result @@ -24,7 +24,7 @@ test_run:cmd('restart server rebootstrap2 with cleanup=True, wait=False, wait_lo --- - true ... -test_run:cmd('start server rebootstrap1 with args="0.1 0.5"') +test_run:cmd('start server rebootstrap1 with args="0.1"') --- - true ... diff --git a/test/replication/rebootstrap.test.lua b/test/replication/rebootstrap.test.lua index 8ddf77912..afd5108e2 100644 --- a/test/replication/rebootstrap.test.lua +++ b/test/replication/rebootstrap.test.lua @@ -13,7 +13,7 @@ test_run:wait_fullmesh(SERVERS) -- test_run:cmd('stop server rebootstrap1') test_run:cmd('restart server rebootstrap2 with cleanup=True, wait=False, wait_load=False, args="0.1 2.0"') -test_run:cmd('start server rebootstrap1 with args="0.1 0.5"') +test_run:cmd('start server rebootstrap1 with args="0.1"') test_run:cmd('switch rebootstrap1') box.info.status -- running diff --git a/test/replication/replica.lua b/test/replication/replica.lua index 20ac064e1..855cf9f50 100644 --- a/test/replication/replica.lua +++ b/test/replication/replica.lua @@ -4,8 +4,8 @@ box.cfg({ listen = os.getenv("LISTEN"), replication = os.getenv("MASTER"), memtx_memory = 107374182, - replication_timeout = 0.1, - replication_connect_timeout = 0.5, + replication_timeout = 1, + replication_connect_timeout = 100, }) require('console').listen(os.getenv('ADMIN')) diff --git a/test/replication/replica_auth.lua b/test/replication/replica_auth.lua index 22ba9146c..306ef578b 100644 --- a/test/replication/replica_auth.lua +++ b/test/replication/replica_auth.lua @@ -2,7 +2,7 @@ local USER_PASS = arg[1] local TIMEOUT = arg[2] and tonumber(arg[2]) or 0.1 -local CON_TIMEOUT = arg[3] and tonumber(arg[3]) or 30.0 +local CON_TIMEOUT = arg[3] and tonumber(arg[3]) or 60.0 require('console').listen(os.getenv('ADMIN')) diff --git a/test/replication/replica_quorum.lua b/test/replication/replica_quorum.lua index dd42b8214..518c30181 100644 --- a/test/replication/replica_quorum.lua +++ b/test/replication/replica_quorum.lua @@ -4,7 +4,7 @@ local SOCKET_DIR = require('fio').cwd() local QUORUM = tonumber(arg[1]) local TIMEOUT = arg[2] and tonumber(arg[2]) or 0.1 -local CON_TIMEOUT = arg[3] and tonumber(arg[3]) or 30.0 +local CON_TIMEOUT = arg[3] and tonumber(arg[3]) or 60.0 INSTANCE_URI = SOCKET_DIR .. '/replica_quorum.sock' function nonexistent_uri(id) diff --git a/test/replication/replica_timeout.lua b/test/replication/replica_timeout.lua index 38922fa3d..a28d83393 100644 --- a/test/replication/replica_timeout.lua +++ b/test/replication/replica_timeout.lua @@ -1,7 +1,7 @@ #!/usr/bin/env tarantool local TIMEOUT = tonumber(arg[1]) -local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 30.0 +local CON_TIMEOUT = arg[2] and tonumber(arg[2]) or 60.0 box.cfg({ listen = os.getenv("LISTEN"), diff --git a/test/replication/sync.result b/test/replication/sync.result index b34501dae..d3154d02d 100644 --- a/test/replication/sync.result +++ b/test/replication/sync.result @@ -51,7 +51,7 @@ function fill() local r = box.info.replication[2] return r ~= nil and r.downstream ~= nil and r.downstream.status ~= 'stopped' - end, 10) + end) for i = count + 101, count + 200 do box.space.test:replace{i} end @@ -164,7 +164,7 @@ box.info.ro -- false - false ... -- Wait for remaining rows to arrive. -test_run:wait_cond(function() return box.space.test:count() == 400 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 400 end) --- - true ... @@ -212,12 +212,12 @@ box.info.ro -- true - true ... -- Wait for remaining rows to arrive. -test_run:wait_cond(function() return box.space.test:count() == 600 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 600 end) --- - true ... -- Make sure replica leaves oprhan state. -test_run:wait_cond(function() return box.info.status ~= 'orphan' end, 10) +test_run:wait_cond(function() return box.info.status ~= 'orphan' end) --- - true ... @@ -237,13 +237,13 @@ box.info.ro -- false -- ER_CFG "duplicate connection with the same replica UUID" error. -- It should print it to the log, but keep trying to synchronize. -- Eventually, it should leave box.cfg() following the master. -box.cfg{replication_timeout = 0.1} +box.cfg{replication_timeout = 0.01} --- ... -box.cfg{replication_sync_lag = 1} +box.cfg{replication_sync_lag = 0.1} --- ... -box.cfg{replication_sync_timeout = 10} +box.cfg{replication_sync_timeout = 50} --- ... test_run:cmd("switch default") diff --git a/test/replication/sync.test.lua b/test/replication/sync.test.lua index cae97a26f..14dea9716 100644 --- a/test/replication/sync.test.lua +++ b/test/replication/sync.test.lua @@ -35,7 +35,7 @@ function fill() local r = box.info.replication[2] return r ~= nil and r.downstream ~= nil and r.downstream.status ~= 'stopped' - end, 10) + end) for i = count + 101, count + 200 do box.space.test:replace{i} end @@ -92,7 +92,7 @@ box.info.status -- running box.info.ro -- false -- Wait for remaining rows to arrive. -test_run:wait_cond(function() return box.space.test:count() == 400 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 400 end) -- Stop replication. replication = box.cfg.replication @@ -116,10 +116,10 @@ box.info.status -- orphan box.info.ro -- true -- Wait for remaining rows to arrive. -test_run:wait_cond(function() return box.space.test:count() == 600 end, 10) +test_run:wait_cond(function() return box.space.test:count() == 600 end) -- Make sure replica leaves oprhan state. -test_run:wait_cond(function() return box.info.status ~= 'orphan' end, 10) +test_run:wait_cond(function() return box.info.status ~= 'orphan' end) box.info.status -- running box.info.ro -- false @@ -131,9 +131,9 @@ box.info.ro -- false -- ER_CFG "duplicate connection with the same replica UUID" error. -- It should print it to the log, but keep trying to synchronize. -- Eventually, it should leave box.cfg() following the master. -box.cfg{replication_timeout = 0.1} -box.cfg{replication_sync_lag = 1} -box.cfg{replication_sync_timeout = 10} +box.cfg{replication_timeout = 0.01} +box.cfg{replication_sync_lag = 0.1} +box.cfg{replication_sync_timeout = 50} test_run:cmd("switch default") box.error.injection.set('ERRINJ_WAL_DELAY', true) -- 2.17.1