From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp37.i.mail.ru (smtp37.i.mail.ru [94.100.177.97]) (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 D1FD541C5DC for ; Fri, 19 Jun 2020 14:48:27 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Fri, 19 Jun 2020 14:48:23 +0300 Message-Id: <1b3fbd233b491ed1ea5f08bde5717918a9a72a57.1591727784.git.avtikhon@tarantool.org> Subject: [Tarantool-patches] [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: Oleg Piskunov , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org, Alexander Turenko 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") -- 2.17.1