From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.mail.ru (smtp1.mail.ru [94.100.179.111]) (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 3600C41C5DA for ; Tue, 23 Jun 2020 15:26:09 +0300 (MSK) References: <20200620041241.GB27675@hpalx> From: Serge Petrenko Message-ID: <3bc1cc97-a6f9-0454-4adc-6d339d399782@tarantool.org> Date: Tue, 23 Jun 2020 15:26:06 +0300 MIME-Version: 1.0 In-Reply-To: <20200620041241.GB27675@hpalx> Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit Content-Language: ru Subject: Re: [Tarantool-patches] [avtikhon@tarantool.org: [PATCH v1] test: fix flaky replication/wal_off.test.lua] List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Alexander V. Tikhonov" Cc: tml 20.06.2020 07:12, Alexander V. Tikhonov пишет: > ----- Forwarded message from "Alexander V. Tikhonov" ----- > > Date: Fri, 19 Jun 2020 14:48:23 +0300 > From: "Alexander V. Tikhonov" > To: Oleg Piskunov , Sergey Bronnikov > Cc: "Alexander V. Tikhonov" , Alexander Turenko , tarantool-patches@dev.tarantool.org > Subject: [PATCH v1] test: fix flaky replication/wal_off.test.lua > X-Mailer: git-send-email 2.17.1 > > Found issue: > > [003] --- replication/wal_off.result Thu Apr 25 13:10:18 2019 > [003] +++ replication/wal_off.reject Tue Jul 16 17:10:31 2019 > [003] @@ -95,6 +95,8 @@ > [003] ... > [003] while string.find(box.info.replication[wal_off_id].upstream.message, check) == nil do fiber.sleep(0.01) end > [003] --- > [003] +- error: '[string "while string.find(box.info.replication[wal_of..."]:1: bad argument > [003] + #1 to ''find'' (string expected, got nil)' > [003] ... > [003] box.cfg { replication = "" } > [003] --- > > To check the upstream status and it's message need to wait until an > upstream appears. This prevents an attempt to index a nil value when > one of those functions are called before a record about a peer appears > in box.info.replication. It was observed on test: > replication/show_error_on_disconnect > after commit > c6bea65f8ef5f6c737cf70c0127189d0ebcbc36e ('replication: recfg with 0 > quorum returns immediately'). > > Closes #4355 > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4355-replication-wall-off > Issue: https://github.com/tarantool/tarantool/issues/4355 > > test/replication/wal_off.result | 6 ++---- > test/replication/wal_off.test.lua | 3 +-- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/test/replication/wal_off.result b/test/replication/wal_off.result > index e0ae84bd7..f69e58893 100644 > --- a/test/replication/wal_off.result > +++ b/test/replication/wal_off.result > @@ -90,11 +90,9 @@ box.cfg { replication = wal_off_uri } > box.cfg { replication_sync_timeout = replication_sync_timeout } > --- > ... > -check = "Read access to universe" > ---- > -... > -while string.find(box.info.replication[wal_off_id].upstream.message, check) == nil do fiber.sleep(0.01) end > +test_run:wait_upstream(wal_off_id, {status = 'loading', message_re = "Read access to universe"}) > --- > +- true > ... > box.cfg { replication = "" } > --- > diff --git a/test/replication/wal_off.test.lua b/test/replication/wal_off.test.lua > index 110f2f1f7..7298ba1d8 100644 > --- a/test/replication/wal_off.test.lua > +++ b/test/replication/wal_off.test.lua > @@ -31,8 +31,7 @@ replication_sync_timeout = box.cfg.replication_sync_timeout > box.cfg { replication_sync_timeout = 0.01 } > box.cfg { replication = wal_off_uri } > box.cfg { replication_sync_timeout = replication_sync_timeout } > -check = "Read access to universe" > -while string.find(box.info.replication[wal_off_id].upstream.message, check) == nil do fiber.sleep(0.01) end > +test_run:wait_upstream(wal_off_id, {status = 'loading', message_re = "Read access to universe"}) > box.cfg { replication = "" } > > test_run:cmd("stop server wal_off") Thanks for  the patch! LGTM. -- Serge Petrenko