From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 5D4A522543 for ; Thu, 14 Feb 2019 05:24:03 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KOJezhUkAlVv for ; Thu, 14 Feb 2019 05:24:03 -0500 (EST) Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id A63BE20ABC for ; Thu, 14 Feb 2019 05:24:02 -0500 (EST) Date: Thu, 14 Feb 2019 13:24:00 +0300 From: Konstantin Osipov Subject: [tarantool-patches] Re: [PATCH v2] Emit NOPs in case of a replication conflict Message-ID: <20190214102400.GA30749@chai> References: <1b5878e62feec7d157aa1fc2f24fde2c3fe7d404.1550043380.git.georgy@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1b5878e62feec7d157aa1fc2f24fde2c3fe7d404.1550043380.git.georgy@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: Georgy Kirichenko * Georgy Kirichenko [19/02/13 10:39]: > Applier writes NOP if it is not able to apply a masters row > because of conflict when the replication_skip_conflict option is set. > This prevents applier from reapplying already skipped rows after > restart. > > Closes: #3977 OK to push. -- Konstantin Osipov, Moscow, Russia, +7 903 626 22 32 http://tarantool.io - www.twitter.com/kostja_osipov