From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 822DD6EC5F; Sun, 18 Apr 2021 18:44:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 822DD6EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618760652; bh=6hkOMQ3jBwYNKdCY2q1MOvKF2MvIajmXZL+Tt8h1+Bs=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=gBqSoLdfiqHhfGQCSjC3rrfIXGaCtki3Ai1sawumjwbGwcWd99P/hk3h0O7OYYp5G mECt0foik8tOWIyAIjQkGyn9Oopn/gdA3B6tCD0mbTI/O45im+nEVCG+Zdz05IS3hS NJnJXl6tjhzJ2a9PEm93+pmL5C1ikoe8gm3Vrrcc= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 DAE5E6EC5F for ; Sun, 18 Apr 2021 18:44:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DAE5E6EC5F Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lY9ak-000312-1H; Sun, 18 Apr 2021 18:44:10 +0300 To: Serge Petrenko , gorcunov@gmail.com Cc: tarantool-patches@dev.tarantool.org References: Message-ID: Date: Sun, 18 Apr 2021 17:44:08 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E748013307ED7ECCBF4892260E197EB99ED8F182A05F5380850404498C7308D46067988009605CA9D9429D0289C8D344817C058ECAC3CE13C8062 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BC08626EA5717D14EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373682D752F1DB00E08638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B23B22D5DCDAB78DA34DA70B7A529FEB71DC9BD0EFF9685B78D2E47CDBA5A96583C09775C1D3CA48CF4964A708C60C975A117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE73AFA331E307B52169FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E73542F54486E6D6388DC4224003CC83647689D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C9783157D03C07D76F862DD792DD908DDF4B51 X-C1DE0DAB: 0D63561A33F958A50A79393384FBCCC5F1162B151970E688CCE70DD3245A8CF4D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D348CDF4129B2EA8560277421E9B554937F275B86238B60E4CF103367A944100FE68451553CEBABF6811D7E09C32AA3244CC8DF22108095AD2F1E68807E39588F403A92A9747B6CC886FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj1t4H7vLuVFWlKyg6NU5G/g== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822823A4255AD1DD79D55B7423A6AC2C23F3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v4 07/12] raft: filter rows based on known peer terms X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" I accidentally updated curl submodule (forgot to update the submodules before doing my amendments), we need to revert it back. > diff --git a/src/box/applier.cc b/src/box/applier.cc > index 61d53fdec..b0e8fbba7 100644 > --- a/src/box/applier.cc > +++ b/src/box/applier.cc > @@ -967,6 +967,59 @@ apply_final_join_tx(struct stailq *rows) > return rc; > } > > +/* Also I forgot to make it /** instead of /*. > + * When elections are enabled we must filter out synchronous rows coming > + * from an instance that fell behind the current leader. This includes > + * both synchronous tx rows and rows for txs following unconfirmed > + * synchronous transactions. > + * The rows are replaced with NOPs to preserve the vclock consistency. > + */