From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp32.i.mail.ru (smtp32.i.mail.ru [94.100.177.92]) (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 7179D45C305 for ; Fri, 4 Dec 2020 21:21:42 +0300 (MSK) Received: by smtp32.i.mail.ru with esmtpa (envelope-from ) id 1klFi9-0002YB-Qw for tarantool-patches@dev.tarantool.org; Fri, 04 Dec 2020 21:21:42 +0300 From: Sergey Ostanevich Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Message-Id: Date: Fri, 4 Dec 2020 21:21:40 +0300 Subject: [Tarantool-patches] [PATCH 1/1] test: fix to resolve box/net_msg_max flaky List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org A problem was gh-4834-netbox-fiber-cancel left a request hanging so the net_msg_max fails in case it follows on the same runner. --- Branch: = http://github.com/tarantool/tarantool/tree/sergos/gh-5013-followup test/box/gh-4834-netbox-fiber-cancel.result | 7 ++++++- test/box/gh-4834-netbox-fiber-cancel.test.lua | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/box/gh-4834-netbox-fiber-cancel.result = b/test/box/gh-4834-netbox-fiber-cancel.result index 5af404e82..81adc4803 100644 --- a/test/box/gh-4834-netbox-fiber-cancel.result +++ b/test/box/gh-4834-netbox-fiber-cancel.result @@ -9,8 +9,12 @@ test_run =3D require('test_run').new() | --- | ... =20 +infinity =3D true + | --- + | ... + -- #4834: Cancelling fiber doesn't interrupt netbox operations -function infinite_call() local channel =3D fiber.channel(1) = pcall(channel:get()) channel.close() end +function infinite_call() while infinity do fiber.sleep(0.01) end end | --- | ... box.schema.func.create('infinite_call') @@ -36,6 +40,7 @@ function netbox_runner() fiber.yield() f:cancel() f:join() + infinity =3D false cn:close() end; | --- diff --git a/test/box/gh-4834-netbox-fiber-cancel.test.lua = b/test/box/gh-4834-netbox-fiber-cancel.test.lua index 59963ba91..2c7cba2dd 100644 --- a/test/box/gh-4834-netbox-fiber-cancel.test.lua +++ b/test/box/gh-4834-netbox-fiber-cancel.test.lua @@ -2,8 +2,10 @@ remote =3D require('net.box') fiber =3D require('fiber') test_run =3D require('test_run').new() =20 +infinity =3D true + -- #4834: Cancelling fiber doesn't interrupt netbox operations -function infinite_call() local channel =3D fiber.channel(1) = pcall(channel:get()) channel.close() end +function infinite_call() while infinity do fiber.sleep(0.01) end end box.schema.func.create('infinite_call') box.schema.user.grant('guest', 'execute', 'function', 'infinite_call') =20 @@ -18,6 +20,7 @@ function netbox_runner() fiber.yield() f:cancel() f:join() + infinity =3D false cn:close() end; test_run:cmd("setopt delimiter ''"); --=20 2.24.3 (Apple Git-128)