From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sergei Voronezhskii Subject: [PATCH v3 4/5] test: use wait_cond to check follow status Date: Thu, 6 Dec 2018 16:38:51 +0300 Message-Id: <20181206133852.75633-5-sergw@tarantool.org> In-Reply-To: <20181206133852.75633-1-sergw@tarantool.org> References: <1544088837.816260678@f398.i.mail.ru> <20181206133852.75633-1-sergw@tarantool.org> To: tarantool-patches@freelists.org Cc: Vladimir Davydov List-ID: After setting timeouts in `box.cfg` and before making a `replace` needs to wait for replicas in `follow` status. Then if `wait_follow()` found not `follow` status it returns true. Which immediately causes an error. Fixes #3734 Part of #2436, #3232 --- test/replication/misc.result | 21 +++++++++++++++------ test/replication/misc.test.lua | 19 +++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/test/replication/misc.result b/test/replication/misc.result index 32676c4ea..c32681a7a 100644 --- a/test/replication/misc.result +++ b/test/replication/misc.result @@ -146,15 +146,24 @@ test_run:cmd("setopt delimiter ';'") --- - true ... +function wait_follow(replicaA, replicaB) + return test_run:wait_cond(function() + return replicaA.status ~= 'follow' or replicaB.status ~= 'follow' + end, 0.01) +end ; +--- +... function test_timeout() + local replicaA = box.info.replication[1].upstream or box.info.replication[2].upstream + local replicaB = box.info.replication[3].upstream or box.info.replication[2].upstream + local follows = test_run:wait_cond(function() + return replicaA.status == 'follow' or replicaB.status == 'follow' + end, 0.1) + if not follows then error('replicas not in follow status') end for i = 0, 99 do box.space.test_timeout:replace({1}) - fiber.sleep(0.005) - local rinfo = box.info.replication - if rinfo[1].upstream and rinfo[1].upstream.status ~= 'follow' or - rinfo[2].upstream and rinfo[2].upstream.status ~= 'follow' or - rinfo[3].upstream and rinfo[3].upstream.status ~= 'follow' then - return error('Replication broken') + if wait_follow(replicaA, replicaB) then + return error(box.info.replication) end end return true diff --git a/test/replication/misc.test.lua b/test/replication/misc.test.lua index 3bf1fc5a1..6a8af05c3 100644 --- a/test/replication/misc.test.lua +++ b/test/replication/misc.test.lua @@ -53,15 +53,22 @@ fiber=require('fiber') box.cfg{replication_timeout = 0.01, replication_connect_timeout=0.01} _ = box.schema.space.create('test_timeout'):create_index('pk') test_run:cmd("setopt delimiter ';'") +function wait_follow(replicaA, replicaB) + return test_run:wait_cond(function() + return replicaA.status ~= 'follow' or replicaB.status ~= 'follow' + end, 0.01) +end ; function test_timeout() + local replicaA = box.info.replication[1].upstream or box.info.replication[2].upstream + local replicaB = box.info.replication[3].upstream or box.info.replication[2].upstream + local follows = test_run:wait_cond(function() + return replicaA.status == 'follow' or replicaB.status == 'follow' + end, 0.1) + if not follows then error('replicas not in follow status') end for i = 0, 99 do box.space.test_timeout:replace({1}) - fiber.sleep(0.005) - local rinfo = box.info.replication - if rinfo[1].upstream and rinfo[1].upstream.status ~= 'follow' or - rinfo[2].upstream and rinfo[2].upstream.status ~= 'follow' or - rinfo[3].upstream and rinfo[3].upstream.status ~= 'follow' then - return error('Replication broken') + if wait_follow(replicaA, replicaB) then + return error(box.info.replication) end end return true -- 2.18.0