From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 dev.tarantool.org (Postfix) with ESMTPS id A75CB469719 for ; Wed, 9 Sep 2020 18:41:37 +0300 (MSK) References: <93df91c8f9e41013155ceec70b62d7c3a25a4c79.1599461246.git.avtikhon@tarantool.org> From: Serge Petrenko Message-ID: <78f4e065-0635-f896-ecfc-b3108df8923b@tarantool.org> Date: Wed, 9 Sep 2020 18:41:36 +0300 MIME-Version: 1.0 In-Reply-To: <93df91c8f9e41013155ceec70b62d7c3a25a4c79.1599461246.git.avtikhon@tarantool.org> Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit Content-Language: ru Subject: Re: [Tarantool-patches] [PATCH v1] test: flaky replication/gh-3642-misc-* test List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Alexander V. Tikhonov" , Kirill Yukhin Cc: tarantool-patches@dev.tarantool.org 07.09.2020 09:48, Alexander V. Tikhonov пишет: > On heavy loaded hosts found the following issue: > > [036] --- replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.result Sun Sep 6 23:49:57 2020 > [036] +++ replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.reject Mon Sep 7 04:07:06 2020 > [036] @@ -63,7 +63,7 @@ > [036] ... > [036] box.info.replication[1].upstream.status > [036] --- > [036] -- follow > [036] +- disconnected > [036] ... > [036] test_run:cmd('switch default') > [036] --- > > It happened because replication upstream status check occurred too > early, when it was only in 'disconnected' state. To give the > replication status check routine ability to reach the needed 'follow' > state, it need to wait for it using test_run:wait_upstream() routine. > > Closes #5276 > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4940-replication-misc > Issue: https://github.com/tarantool/tarantool/issues/5276 > > .../gh-3642-misc-no-socket-leak-on-replica-disconnect.result | 4 ++-- > ...gh-3642-misc-no-socket-leak-on-replica-disconnect.test.lua | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/test/replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.result b/test/replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.result > index d068ad8fc..e2adb3bc3 100644 > --- a/test/replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.result > +++ b/test/replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.result > @@ -61,9 +61,9 @@ test_run:cmd("setopt delimiter ''"); > --- > - true > ... > -box.info.replication[1].upstream.status > +test_run:wait_upstream(1, {status = 'follow'}) > --- > -- follow > +- true > ... > test_run:cmd('switch default') > --- > diff --git a/test/replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.test.lua b/test/replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.test.lua > index 9cfbe7214..ac26aa314 100644 > --- a/test/replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.test.lua > +++ b/test/replication/gh-3642-misc-no-socket-leak-on-replica-disconnect.test.lua > @@ -28,7 +28,7 @@ for i = 1, 64 do > end; > test_run:cmd("setopt delimiter ''"); > > -box.info.replication[1].upstream.status > +test_run:wait_upstream(1, {status = 'follow'}) > > test_run:cmd('switch default') > LGTM -- Serge Petrenko