From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@dev.tarantool.org, sergepetrenko@tarantool.org Subject: [Tarantool-patches] [PATCH v2 18/19] replication: only send confirmed data during final join Date: Tue, 30 Jun 2020 01:15:19 +0200 [thread overview] Message-ID: <8a49694d7373cf8976924aef2ca498bc7c6451d5.1593472477.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1593472477.git.v.shpilevoy@tarantool.org> From: Serge Petrenko <sergepetrenko@tarantool.org> Final join (or register) stage is needed to deliver the replica its _cluster registration. Since this stage is followed by a snapshot on replica, the data received during this stage must be confirmed. Make master check that there are no rollbacks for the data to be sent during final join and that all the data is confirmed before final join starts. Closes #5097 --- src/box/box.cc | 33 +++++++++++++++++++++++++++++++++ src/box/txn_limbo.c | 5 +++++ src/box/txn_limbo.h | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/src/box/box.cc b/src/box/box.cc index ad76f4f00..37bf4ab3b 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -1711,6 +1711,11 @@ box_process_register(struct ev_io *io, struct xrow_header *header) say_info("registering replica %s at %s", tt_uuid_str(&instance_uuid), sio_socketname(io->fd)); + /* See box_process_join() */ + txn_limbo_start_recording(&txn_limbo); + auto limbo_guard = make_scoped_guard([&] { + txn_limbo_stop_recording(&txn_limbo); + }); struct vclock start_vclock; vclock_copy(&start_vclock, &replicaset.vclock); @@ -1726,6 +1731,14 @@ box_process_register(struct ev_io *io, struct xrow_header *header) struct vclock stop_vclock; vclock_copy(&stop_vclock, &replicaset.vclock); + if (txn_limbo_got_rollback(&txn_limbo)) + tnt_raise(ClientError, ER_SYNC_ROLLBACK); + txn_limbo_stop_recording(&txn_limbo); + limbo_guard.is_active = false; + + if (txn_limbo_wait_confirm(&txn_limbo) != 0) + diag_raise(); + /* * Feed replica with WALs in range * (start_vclock, stop_vclock) so that it gets its @@ -1847,6 +1860,18 @@ box_process_join(struct ev_io *io, struct xrow_header *header) say_info("joining replica %s at %s", tt_uuid_str(&instance_uuid), sio_socketname(io->fd)); + /* + * In order to join a replica, master has to make sure it + * doesn't send unconfirmed data. We have to check that + * there are no rolled back transactions between + * start_vclock and stop_vclock, and that the data right + * before stop_vclock is confirmed, before we can proceed + * to final join. + */ + txn_limbo_start_recording(&txn_limbo); + auto limbo_guard = make_scoped_guard([&] { + txn_limbo_stop_recording(&txn_limbo); + }); /* * Initial stream: feed replica with dirty data from engines. */ @@ -1868,6 +1893,14 @@ box_process_join(struct ev_io *io, struct xrow_header *header) struct vclock stop_vclock; vclock_copy(&stop_vclock, &replicaset.vclock); + if (txn_limbo_got_rollback(&txn_limbo)) + tnt_raise(ClientError, ER_SYNC_ROLLBACK); + txn_limbo_stop_recording(&txn_limbo); + limbo_guard.is_active = false; + + if (txn_limbo_wait_confirm(&txn_limbo) != 0) + diag_raise(); + /* Send end of initial stage data marker */ struct xrow_header row; xrow_encode_vclock_xc(&row, &stop_vclock); diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c index abea26731..fbe4dcecf 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -40,6 +40,8 @@ txn_limbo_create(struct txn_limbo *limbo) rlist_create(&limbo->queue); limbo->instance_id = REPLICA_ID_NIL; vclock_create(&limbo->vclock); + limbo->is_recording = false; + limbo->got_rollback = false; } struct txn_limbo_entry * @@ -90,8 +92,11 @@ txn_limbo_pop(struct txn_limbo *limbo, struct txn_limbo_entry *entry) assert(!rlist_empty(&entry->in_queue)); assert(rlist_last_entry(&limbo->queue, struct txn_limbo_entry, in_queue) == entry); + assert(entry->is_rollback); (void) limbo; rlist_del_entry(entry, in_queue); + if (limbo->is_recording) + limbo->got_rollback = true; } void diff --git a/src/box/txn_limbo.h b/src/box/txn_limbo.h index 138093c7c..a9fc83b0c 100644 --- a/src/box/txn_limbo.h +++ b/src/box/txn_limbo.h @@ -117,6 +117,13 @@ struct txn_limbo { * transactions, created on the limbo's owner node. */ struct vclock vclock; + /** Set to true when limbo records rollback occurrence. */ + bool is_recording; + /** + * Whether any rollbacks happened during the recording + * period. + */ + bool got_rollback; }; /** @@ -126,6 +133,34 @@ struct txn_limbo { */ extern struct txn_limbo txn_limbo; +/** + * Make limbo remember the occurrence of rollbacks due to failed + * quorum collection. + */ +static inline void +txn_limbo_start_recording(struct txn_limbo *limbo) +{ + limbo->is_recording = true; +} + +/** Stop the recording of failed quorum collection events. */ +static inline void +txn_limbo_stop_recording(struct txn_limbo *limbo) +{ + limbo->is_recording = false; + limbo->got_rollback = false; +} + +/** + * Returns true in case the limbo rolled back any tx since the + * moment txn_limbo_start_recording() was called. + */ +static inline bool +txn_limbo_got_rollback(struct txn_limbo *limbo) +{ + return limbo->got_rollback; +} + /** * Allocate, create, and append a new transaction to the limbo. * The limbo entry is allocated on the transaction's region. -- 2.21.1 (Apple Git-122.3)
next prev parent reply other threads:[~2020-06-29 23:15 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1593723973.git.sergeyb@tarantool.org> 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 00/19] Sync replication Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 01/19] replication: introduce space.is_sync option Vladislav Shpilevoy 2020-06-30 23:00 ` Vladislav Shpilevoy 2020-07-01 15:55 ` Sergey Ostanevich 2020-07-01 23:46 ` Vladislav Shpilevoy 2020-07-02 8:25 ` Serge Petrenko 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 10/19] txn_limbo: add ROLLBACK processing Vladislav Shpilevoy 2020-07-05 15:29 ` Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 11/19] box: rework local_recovery to use async txn_commit Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 12/19] replication: support ROLLBACK and CONFIRM during recovery Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 13/19] replication: add test for synchro CONFIRM/ROLLBACK Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 14/19] applier: remove writer_cond Vladislav Shpilevoy 2020-07-02 9:13 ` Serge Petrenko 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 15/19] applier: send heartbeat not only on commit, but on any write Vladislav Shpilevoy 2020-07-01 23:55 ` Vladislav Shpilevoy 2020-07-03 12:23 ` Serge Petrenko 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 16/19] txn_limbo: add diag_set in txn_limbo_wait_confirm Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 17/19] replication: delay initial join until confirmation Vladislav Shpilevoy 2020-06-29 23:15 ` Vladislav Shpilevoy [this message] 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 19/19] replication: block async transactions when not empty limbo Vladislav Shpilevoy 2020-07-01 17:12 ` Sergey Ostanevich 2020-07-01 23:47 ` Vladislav Shpilevoy 2020-07-03 12:28 ` Serge Petrenko 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 02/19] replication: introduce replication_synchro_* cfg options Vladislav Shpilevoy 2020-07-01 16:05 ` Sergey Ostanevich 2020-07-01 23:46 ` Vladislav Shpilevoy 2020-07-02 8:29 ` Serge Petrenko 2020-07-02 23:36 ` Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 03/19] txn: add TXN_WAIT_ACK flag Vladislav Shpilevoy 2020-07-01 17:14 ` Sergey Ostanevich 2020-07-01 23:46 ` Vladislav Shpilevoy 2020-07-02 8:30 ` Serge Petrenko 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 04/19] replication: make sync transactions wait quorum Vladislav Shpilevoy 2020-06-30 23:00 ` Vladislav Shpilevoy 2020-07-02 8:48 ` Serge Petrenko 2020-07-03 21:16 ` Vladislav Shpilevoy 2020-07-05 16:05 ` Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 05/19] xrow: introduce CONFIRM and ROLLBACK entries Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 06/19] txn: introduce various reasons for txn rollback Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 07/19] replication: write and read CONFIRM entries Vladislav Shpilevoy 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 08/19] replication: add support of qsync to the snapshot machinery Vladislav Shpilevoy 2020-07-02 8:52 ` Serge Petrenko 2020-07-08 11:43 ` Leonid Vasiliev 2020-06-29 23:15 ` [Tarantool-patches] [PATCH v2 09/19] txn_limbo: add timeout when waiting for acks Vladislav Shpilevoy 2020-06-29 23:22 ` [Tarantool-patches] [PATCH v2 00/19] Sync replication Vladislav Shpilevoy 2020-06-30 23:00 ` [Tarantool-patches] [PATCH v2 20/19] replication: add test for quorum 1 Vladislav Shpilevoy 2020-07-03 12:32 ` Serge Petrenko 2020-07-02 21:13 ` [Tarantool-patches] [PATCH 1/4] replication: regression test on gh-5119 [not fixed] sergeyb 2020-07-02 21:13 ` [Tarantool-patches] [PATCH 2/4] replication: add advanced tests for sync replication sergeyb 2020-07-02 22:46 ` Sergey Bronnikov 2020-07-02 23:20 ` Vladislav Shpilevoy 2020-07-06 12:30 ` Sergey Bronnikov 2020-07-06 23:31 ` Vladislav Shpilevoy 2020-07-07 12:12 ` Sergey Bronnikov 2020-07-07 20:57 ` Vladislav Shpilevoy 2020-07-08 12:07 ` Sergey Bronnikov 2020-07-08 22:13 ` Vladislav Shpilevoy 2020-07-09 9:39 ` Sergey Bronnikov 2020-07-02 21:13 ` [Tarantool-patches] [PATCH 3/4] replication: add tests for sync replication with anon replica sergeyb 2020-07-06 23:31 ` Vladislav Shpilevoy 2020-07-02 21:13 ` [Tarantool-patches] [PATCH 4/4] replication: add tests for sync replication with snapshots sergeyb 2020-07-02 22:46 ` Sergey Bronnikov 2020-07-02 23:20 ` Vladislav Shpilevoy 2020-07-06 23:31 ` Vladislav Shpilevoy 2020-07-07 16:00 ` Sergey Bronnikov 2020-07-06 23:31 ` [Tarantool-patches] [PATCH] Add new error injection constant ERRINJ_SYNC_TIMEOUT Vladislav Shpilevoy 2020-07-10 0:50 ` [Tarantool-patches] [PATCH v2 00/19] Sync replication Vladislav Shpilevoy 2020-07-10 7:40 ` 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=8a49694d7373cf8976924aef2ca498bc7c6451d5.1593472477.git.v.shpilevoy@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=sergepetrenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 18/19] replication: only send confirmed data during final join' \ /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