From: Cyrill Gorcunov <gorcunov@gmail.com> To: Serge Petrenko <sergepetrenko@tarantool.org> Cc: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org Subject: Re: [Tarantool-patches] [PATCH] applier: follow vclock to the last tx row Date: Thu, 23 Apr 2020 12:41:12 +0300 [thread overview] Message-ID: <20200423094112.GD3072@uranus> (raw) In-Reply-To: <20200422182810.79257-1-sergepetrenko@tarantool.org> On Wed, Apr 22, 2020 at 09:28:10PM +0300, Serge Petrenko wrote: > Since the introduction of transaction boundaries in replication > protocol, appliers follow replicaset.applier.vclock to the lsn of the > first row in an arrived batch. This is enough and doesn't lead to errors > when replicating from other instances, respecting transaction boundaries > (instances with version 2.1.2 and up). However, if there's a 1.10 > instance in 2.1.2+ cluster, it sends every single tx row as a separate > transaction, breaking the comparison with replicaset.applier.vclock and > making the applier apply part of the changes, it has already applied > when processing a full transaction coming from another 2.x instance. > Such behaviour leads to ER_TUPLE_FOUND errors in the scenario described > above. > In order to guard from such cases, follow replicaset.applier.vclock to > the lsn of the last row in tx. > > Closes #4924 Serge, can we please put this into code comment itself? Say like (please check that I didn't miss somthing) --- diff --git a/src/box/applier.cc b/src/box/applier.cc index 68de3c08c..495bc7393 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -736,6 +736,7 @@ applier_apply_tx(struct stailq *rows) { struct xrow_header *first_row = &stailq_first_entry(rows, struct applier_tx_row, next)->row; + struct xrow_header *last_row; struct replica *replica = replica_by_id(first_row->replica_id); /* * In a full mesh topology, the same set of changes @@ -826,9 +827,16 @@ applier_apply_tx(struct stailq *rows) if (txn_commit_async(txn) < 0) goto fail; - /* Transaction was sent to journal so promote vclock. */ - vclock_follow(&replicaset.applier.vclock, - first_row->replica_id, first_row->lsn); + /* + * The transaction was sent to the journal so promote vclock. + * + * Use the lsn of the last row here for backward compatibility + * with 1.10 series where we sent every single tx in a row as + * a separate transaction. + */ + last_row = &stailq_last_entry(rows, struct applier_tx_row, next)->row; + vclock_follow(&replicaset.applier.vclock, last_row->replica_id, + last_row->lsn); latch_unlock(latch); return 0; rollback:
next prev parent reply other threads:[~2020-04-23 9:41 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-22 18:28 Serge Petrenko 2020-04-23 9:41 ` Cyrill Gorcunov [this message] 2020-04-23 9:53 ` Serge Petrenko 2020-04-23 9:54 ` Cyrill Gorcunov 2020-04-23 11:19 ` Serge Petrenko 2020-04-26 18:55 ` Vladislav Shpilevoy 2020-04-27 10:22 ` Kirill Yukhin 2020-04-27 10:39 ` Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200423094112.GD3072@uranus \ --to=gorcunov@gmail.com \ --cc=sergepetrenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH] applier: follow vclock to the last tx row' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox