From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp34.i.mail.ru (smtp34.i.mail.ru [94.100.177.94]) (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 1F4DA469710 for ; Thu, 7 May 2020 17:11:14 +0300 (MSK) Date: Thu, 7 May 2020 14:11:13 +0000 From: Nikita Pettik Message-ID: <20200507141113.GD11724@tarantool.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Subject: Re: [Tarantool-patches] [PATCH 0/2] Fix crash in case of lack of FDs during recovery List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org On 03 May 21:20, Vladislav Shpilevoy wrote: > Why do you base your patches on top of 1.10? Doesn't the > bug exist on master? Yep, master is affected as well. Originally I found it on 1.10 so firstly prepared patch for 1.10. There's no big difference in lsm recovery code, so patch can be backported with ease (from master to 1.10). Will push to master firstly, when patch-set is ready-to-push. Anyway, thanks for noting that. > On 30/04/2020 21:27, Nikita Pettik wrote: > > Branch: https://github.com/tarantool/tarantool/commits/np/gh-4805-too-many-fds > > Issue: https://github.com/tarantool/tarantool/issues/4805 > > > > First patch adds simple macro which allows error injection to be delayed. > > It also can be used in this series: > > https://lists.tarantool.org/pipermail/tarantool-patches/2020-April/016367.html > > > > Nikita Pettik (2): > > errinj: introduce delayed injection > > vinyl: drop wasted runs in case range recovery fails > > > > src/box/vy_lsm.c | 14 ++- > > src/box/vy_run.c | 4 + > > src/errinj.h | 10 ++ > > test/box/errinj.result | 1 + > > test/vinyl/errinj_recovery.lua | 10 ++ > > .../gh-4805-open-run-err-recovery.result | 101 ++++++++++++++++++ > > .../gh-4805-open-run-err-recovery.test.lua | 38 +++++++ > > test/vinyl/suite.ini | 2 +- > > 8 files changed, 176 insertions(+), 4 deletions(-) > > create mode 100644 test/vinyl/errinj_recovery.lua > > create mode 100644 test/vinyl/gh-4805-open-run-err-recovery.result > > create mode 100644 test/vinyl/gh-4805-open-run-err-recovery.test.lua > >