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 C6563257E9 for ; Tue, 12 Feb 2019 14:29:23 -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 rypOKkDZndTK for ; Tue, 12 Feb 2019 14:29:23 -0500 (EST) Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [94.100.177.105]) (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 7ED70257B8 for ; Tue, 12 Feb 2019 14:29:23 -0500 (EST) Date: Tue, 12 Feb 2019 22:29:21 +0300 From: Konstantin Osipov Subject: [tarantool-patches] Re: [PATCH] Emit NOPs in case of a replication conflict Message-ID: <20190212192921.GC10042@chai> References: <49a2387ecbdb9d0a98090e37b11af09dfea720a5.1549983926.git.georgy@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <49a2387ecbdb9d0a98090e37b11af09dfea720a5.1549983926.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/12 18:09]: > struct error *e = diag_last_error(diag_get()); > /** > - * Silently skip ER_TUPLE_FOUND error if such > - * option is set in config. > + * In case of ER_TUPLE_FOUND error replca row > + * with nop if such option is set in config. Please fix the comment. replca -> replica, the English grammar is not looking proper to me. Let's write something along these lines: In case of ER_TUPLE_FOUND error and replication_skip_conflict configuration error, skip applying the foreign row and replace it with NOP in the local write ahead log. Otherwise the patch is OK to push. -- Konstantin Osipov, Moscow, Russia, +7 903 626 22 32 http://tarantool.io - www.twitter.com/kostja_osipov