From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp16.mail.ru (smtp16.mail.ru [94.100.176.153]) (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 5D64040F3AE for ; Wed, 24 Jun 2020 16:41:54 +0300 (MSK) Date: Wed, 24 Jun 2020 13:41:53 +0000 From: Nikita Pettik Message-ID: <20200624134153.GA6490@tarantool.org> References: <50a25fbae907f1b0d5406fb2e78d40d3e42a8a8d.1591029888.git.korablev@tarantool.org> <4a83c68d-2dfd-23a8-97cd-5a429639dc3c@tarantool.org> <20200619122412.GA19725@tarantool.org> <8785dcba-4031-7b34-d159-ec5071cfd3db@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <8785dcba-4031-7b34-d159-ec5071cfd3db@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v2] vinyl: restart read iterator in case of rolled back WAL List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aleksandr Lyapunov Cc: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org On 19 Jun 16:01, Aleksandr Lyapunov wrote: > Great, lgtm. Pushed to master, 2.4, 2.3 and 1.10. Changelogs are updated correspondingly. Branch is dropped. > Btw, I didn't try to run tests, I hope you did it. > > On 6/19/20 3:24 PM, Nikita Pettik wrote: > > > > Ok, I'm fine with it. Consider this change: > > > > diff --git a/src/box/vy_read_iterator.c b/src/box/vy_read_iterator.c > > index 62a8722d9..409796910 100644 > > --- a/src/box/vy_read_iterator.c > > +++ b/src/box/vy_read_iterator.c > > @@ -378,65 +378,6 @@ vy_read_iterator_scan_disk(struct vy_read_iterator *itr, uint32_t disk_src, > > return 0; > > }