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 E13A32EF36 for ; Mon, 10 Jun 2019 02:08:21 -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 UTyDi8-2YJSO for ; Mon, 10 Jun 2019 02:08:21 -0400 (EDT) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 328EC2E1A7 for ; Mon, 10 Jun 2019 02:08:21 -0400 (EDT) Date: Mon, 10 Jun 2019 09:07:57 +0300 From: Alexander Turenko Subject: [tarantool-patches] Re: [PATCH v1] test: replication/misc fix for high load Message-ID: <20190610060756.rhc5nhpfuza72v4e@tkn_work_nb> References: <6b19bb4ba0d1f35c2c3073ba7555d0f20ae85ed2.1559913814.git.avtikhon@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <6b19bb4ba0d1f35c2c3073ba7555d0f20ae85ed2.1559913814.git.avtikhon@tarantool.org> 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 V. Tikhonov" Cc: tarantool-patches@freelists.org, Serge Petrenko I'm okay. Serge, do you have any objections? WBR, Alexander Turenko. On Fri, Jun 07, 2019 at 04:25:12PM +0300, Alexander V. Tikhonov wrote: > Fixed test replication/misc to be able to run it on > hosts under high load. Changed downstream check to > use test_run:wait_downstream() function, to wait for > certain box.info.replication values to fix the error: > > [050] replication/misc.test.lua [ fail ] > [050] > [050] Test failed! Result content mismatch: > [050] --- replication/misc.result Thu Jun 6 06:46:54 2019 > [050] +++ replication/misc.reject Fri Jun 7 05:55:00 2019 > [050] @@ -622,7 +622,7 @@ > [050] ... > [050] box.info.replication[2].downstream.status > [050] --- > [050] -- stopped > [050] +- follow > [050] ... > [050] test_run:cmd("stop server replica") > [050] --- > > Closes #4277 > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4277-test-replication-misc > Issue: https://github.com/tarantool/tarantool/issues/4277 > > test/replication/misc.result | 4 ++-- > test/replication/misc.test.lua | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/test/replication/misc.result b/test/replication/misc.result > index 5d7a6512e..f896ee4a9 100644 > --- a/test/replication/misc.result > +++ b/test/replication/misc.result > @@ -620,9 +620,9 @@ test_run:wait_log("replica", "REPLICASET_UUID_MISMATCH", nil, 1.0) > --- > - REPLICASET_UUID_MISMATCH > ... > -box.info.replication[2].downstream.status > +test_run:wait_downstream(2, {status = 'stopped'}) > --- > -- stopped > +- true > ... > test_run:cmd("stop server replica") > --- > diff --git a/test/replication/misc.test.lua b/test/replication/misc.test.lua > index 5a6cecfaa..4be12ba3b 100644 > --- a/test/replication/misc.test.lua > +++ b/test/replication/misc.test.lua > @@ -251,7 +251,7 @@ _ = box.space._schema:replace{'cluster', tostring(uuid.new())} > -- master believes replica is in cluster, but their cluster UUIDs differ. > test_run:cmd("start server replica") > test_run:wait_log("replica", "REPLICASET_UUID_MISMATCH", nil, 1.0) > -box.info.replication[2].downstream.status > +test_run:wait_downstream(2, {status = 'stopped'}) > > test_run:cmd("stop server replica") > test_run:cmd("cleanup server replica") > -- > 2.17.1 >