From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vdavydov.dev@gmail.com>
Date: Thu, 14 Feb 2019 17:19:03 +0300
From: Vladimir Davydov <vdavydov.dev@gmail.com>
Subject: Re: [tarantool-patches] [PATCH v2] Emit NOPs in case of a
 replication conflict
Message-ID: <20190214141903.6fzvn2r6hbgkfdla@esperanza>
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>
To: Georgy Kirichenko <georgy@tarantool.org>
Cc: tarantool-patches@freelists.org
List-ID: <tarantool-patches.dev.tarantool.org>

On Wed, Feb 13, 2019 at 10:37:02AM +0300, Georgy Kirichenko wrote:
> 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

Pushed to 2.1.