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 EF0DA6EC5F; Tue, 20 Apr 2021 23:55:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EF0DA6EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618952124; bh=YtpuDkBUYyIJLUB51Pd/cbGZDfyJUIOzz2tzzdrRrn8=; 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=v2HZmAawYoBP6+IicqsAUF9CeTz3oNzseR7JRrub05c6EHts/lrm8NxD7OIc5WfNa Cu7E8C9hpbIkwwVb4jY/I5H+TG/nCwuGR2Mi0wR8oGC1mnQw2I0nvTelD8ILLeQcpO mqNboSw3/Absw/X8F9pZTZKa0CJLYr+wg51ukAHk= Received: from smtp37.i.mail.ru (smtp37.i.mail.ru [94.100.177.97]) (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 542E76EC5F for ; Tue, 20 Apr 2021 23:55:22 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 542E76EC5F Received: by smtp37.i.mail.ru with esmtpa (envelope-from ) id 1lYxOz-0000Nj-Md; Tue, 20 Apr 2021 23:55:22 +0300 To: v.shpilevoy@tarantool.org, gorcunov@gmail.com Cc: tarantool-patches@dev.tarantool.org References: <60125d86-5142-c616-bbed-d479f7454219@tarantool.org> <0545e52f-028c-882b-c3d1-2dcc45b9fc0c@tarantool.org> Message-ID: <73119f15-03c2-1b61-a14e-2b7f948b7869@tarantool.org> Date: Tue, 20 Apr 2021 23:55:21 +0300 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: <0545e52f-028c-882b-c3d1-2dcc45b9fc0c@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E74800BD71C2E2CF43DDE8CBA234A641A13D4182A05F538085040D70D7A2E4346A9D448DF1F25DA96AF93CCFC47EE0DCC83A676472D93EA6FE311 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78981306C6E927004EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378D64EDD178B2A1008638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B29D538C037A68CBF5785CFDD06E476B4079373A8315E4CF65D2E47CDBA5A96583C09775C1D3CA48CFCA5A41EBD8A3A0199FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C327ED053E960B195E117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F790063757B1FBEA53BC6EDBEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C9783191DC880EF20D8C7AD5EE6400B98F466E X-C1DE0DAB: 0D63561A33F958A57CC58A33CAB0E2C3F9214EC16357618A2940B984315FC5F8D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C02783DDD5A45DEF3723DA6D4F5264E697840E9D47AF42BEA254AB5ACC2FCD781C4832CD20F276441D7E09C32AA3244C4589FD52267F07F24F8A57B3DFA6B92CD9ADFF0C0BDB8D1FFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojlPRl29Bx4WE+vVRaAAUMew== X-Mailru-Sender: 3B9A0136629DC9125D61937A2360A4468C92E49128E8BB38DEF7921CD504274BD4F9BCE6C86E83FC424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 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: Serge Petrenko via Tarantool-patches Reply-To: Serge Petrenko Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 20.04.2021 23:31, Serge Petrenko via Tarantool-patches пишет: > > > 20.04.2021 23:29, Serge Petrenko via Tarantool-patches пишет: >> >> >> 16.04.2021 19:25, Serge Petrenko пишет: >>> Start writing the actual leader term together with the PROMOTE request >>> and process terms in PROMOTE requests on receiver side. >>> >>> Make applier only apply synchronous transactions from the instance >>> which >>> has the greatest term as received in PROMOTE requests. >>> >>> Closes #5445 >>> >> >> A couple of fixes on top: >> Only apply  PROMOTE when it's for a greater term than already received. >> If promote tries to confirm entries for instance id other than >> limbo->owner_id >> rollback everything that's unconfirmed. > > Sorry, discard this. election_qsync_stress hangs again with this change. > > I haven't pushed it yet anyway. > This part of change is good. I applied it and pushed the branch: ============================== diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c index 14e87cd3d..ad5093750 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -649,8 +649,14 @@ txn_limbo_process(struct txn_limbo *limbo, const struct synchro_request *req)         uint32_t origin = req->origin_id;         if (txn_limbo_replica_term(limbo, origin) < term) {                 vclock_follow(&limbo->promote_term_map, origin, term); -               if (term > limbo->promote_greatest_term) +               if (term > limbo->promote_greatest_term) {                         limbo->promote_greatest_term = term; +               } else if (req->type == IPROTO_PROMOTE) { +                       /* +                        * PROMOTE for outdated term. Ignore. +                        */ +                       return; +               }         }         if (req->replica_id == REPLICA_ID_NIL) {                 /* =============================== -- Serge Petrenko