From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp42.i.mail.ru (smtp42.i.mail.ru [94.100.177.102]) (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 5C885469719 for ; Mon, 9 Nov 2020 16:35:07 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Mon, 9 Nov 2020 16:35:04 +0300 Message-Id: <55a359863869f8dbf0ee0cea4676b9f4d5c6cef6.1604928833.git.avtikhon@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v1] test: fix hang of vinyl/gh-4810-dump-during* test List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kirill Yukhin Cc: tarantool-patches@dev.tarantool.org During testing process: https://gitlab.com/tarantool/tarantool/-/jobs/800798411#L5693 found that test vinyl/gh-4810-dump-during-index-build.test.lua hanged: --- vinyl/gh-4810-dump-during-index-build.result Tue Oct 20 08:41:33 2020 +++ var/031_vinyl/gh-4810-dump-during-index-build.result Fri May 8 08:23:45 2020 @@ -117,34 +117,3 @@ for i = 1, ch:size() do ch:get() end; - | --- - | ... - This issue stops the testing till the complete timeout of the test-run will stop all the testing process. To avoid of it 'wait_cond()' routine was added to 'ch:get()' command to set it's local timeout to avoid of waiting for test-run global timeout. Needed for #5508 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-5508-hang-gh-4810 Issue: https://github.com/tarantool/tarantool/issues/5508 test/vinyl/gh-4810-dump-during-index-build.result | 2 +- test/vinyl/gh-4810-dump-during-index-build.test.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/vinyl/gh-4810-dump-during-index-build.result b/test/vinyl/gh-4810-dump-during-index-build.result index f55c44a1f..ceb098c02 100644 --- a/test/vinyl/gh-4810-dump-during-index-build.result +++ b/test/vinyl/gh-4810-dump-during-index-build.result @@ -115,7 +115,7 @@ stop = true; | --- | ... for i = 1, ch:size() do - ch:get() + test_run:wait_cond(function() return ch:get() end) end; | --- | ... diff --git a/test/vinyl/gh-4810-dump-during-index-build.test.lua b/test/vinyl/gh-4810-dump-during-index-build.test.lua index 7b7026498..13b3d5a2a 100644 --- a/test/vinyl/gh-4810-dump-during-index-build.test.lua +++ b/test/vinyl/gh-4810-dump-during-index-build.test.lua @@ -61,7 +61,7 @@ fiber.sleep(3); stop = true; for i = 1, ch:size() do - ch:get() + test_run:wait_cond(function() return ch:get() end) end; test_run:cmd("setopt delimiter ''"); -- 2.25.1