From: Serge Petrenko via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org, gorcunov@gmail.com Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v3 12/12] replication: send current Raft term in join response Date: Tue, 29 Jun 2021 01:12:58 +0300 [thread overview] Message-ID: <f5399ea47c4529414462d0eea5f30e54856e82d4.1624918078.git.sergepetrenko@tarantool.org> (raw) In-Reply-To: <cover.1624918077.git.sergepetrenko@tarantool.org> Make Raft nodes send out their latest persisted term to joining replicas. Follow-up #6034 --- src/box/applier.cc | 5 +++++ src/box/relay.cc | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/box/applier.cc b/src/box/applier.cc index 482b9446a..978383e64 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -459,6 +459,11 @@ applier_wait_snapshot(struct applier *applier) if (xrow_decode_synchro(&row, &req) != 0) diag_raise(); txn_limbo_process(&txn_limbo, &req); + } else if (iproto_type_is_raft_request(row.type)) { + struct raft_request req; + if (xrow_decode_raft(&row, &req, NULL) != 0) + diag_raise(); + box_raft_recover(&req); } else if (row.type != IPROTO_JOIN_SNAPSHOT) { tnt_raise(ClientError, ER_UNKNOWN_REQUEST_TYPE, (uint32_t)row.type); diff --git a/src/box/relay.cc b/src/box/relay.cc index 4b102a777..70f1a045b 100644 --- a/src/box/relay.cc +++ b/src/box/relay.cc @@ -428,7 +428,9 @@ relay_initial_join(int fd, uint64_t sync, struct vclock *vclock, diag_raise(); struct synchro_request req; + struct raft_request raft_req; txn_limbo_checkpoint(&txn_limbo, &req); + box_raft_checkpoint_local(&raft_req); /* Respond to the JOIN request with the current vclock. */ struct xrow_header row; @@ -451,6 +453,10 @@ relay_initial_join(int fd, uint64_t sync, struct vclock *vclock, row.sync = sync; coio_write_xrow(&relay->io, &row); + xrow_encode_raft(&row, &fiber()->gc, &raft_req); + row.sync = sync; + coio_write_xrow(&relay->io, &row); + /* Mark the end of the metadata stream. */ row.type = IPROTO_JOIN_SNAPSHOT; coio_write_xrow(&relay->io, &row); -- 2.30.1 (Apple Git-130)
next prev parent reply other threads:[~2021-06-28 22:19 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-28 22:12 [Tarantool-patches] [PATCH v3 00/12] forbid implicit limbo ownership transition Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 01/12] replication: always send raft state to subscribers Serge Petrenko via Tarantool-patches 2021-07-04 12:12 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-09 9:43 ` Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 02/12] txn_limbo: fix promote term filtering Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 03/12] raft: refactor raft_new_term() Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 04/12] box: make promote always bump the term Serge Petrenko via Tarantool-patches 2021-07-04 12:14 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-14 18:26 ` Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 05/12] replication: forbid implicit limbo owner transition Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 06/12] box: allow calling promote on a candidate Serge Petrenko via Tarantool-patches 2021-07-04 12:14 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-14 18:26 ` Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 07/12] box: introduce `box.ctl.demote` Serge Petrenko via Tarantool-patches 2021-07-04 12:27 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-14 18:28 ` Serge Petrenko via Tarantool-patches 2021-07-21 23:28 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-23 7:44 ` Sergey Petrenko via Tarantool-patches 2021-07-26 23:50 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-29 20:56 ` Sergey Petrenko via Tarantool-patches 2021-08-01 16:19 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-03 7:56 ` Serge Petrenko via Tarantool-patches 2021-08-03 23:25 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-04 13:08 ` Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 08/12] txn_limbo: persist the latest effective promote in snapshot Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 09/12] replication: encode version in JOIN request Serge Petrenko via Tarantool-patches 2021-07-04 12:27 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-14 18:28 ` Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 10/12] replication: add META stage to JOIN Serge Petrenko via Tarantool-patches 2021-07-04 12:28 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-14 18:28 ` Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` [Tarantool-patches] [PATCH v3 11/12] replication: send latest effective promote in initial join Serge Petrenko via Tarantool-patches 2021-07-04 12:28 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-14 18:28 ` Serge Petrenko via Tarantool-patches 2021-06-28 22:12 ` Serge Petrenko via Tarantool-patches [this message] 2021-07-04 12:29 ` [Tarantool-patches] [PATCH v3 12/12] replication: send current Raft term in join response Vladislav Shpilevoy via Tarantool-patches 2021-07-14 18:28 ` Serge Petrenko via Tarantool-patches 2021-08-04 22:41 ` [Tarantool-patches] [PATCH v3 00/12] forbid implicit limbo ownership transition Vladislav Shpilevoy via Tarantool-patches 2021-08-06 7:54 ` Vitaliia Ioffe via Tarantool-patches 2021-08-06 8:31 ` Kirill Yukhin via Tarantool-patches 2021-08-08 10:46 ` Vladislav Shpilevoy via Tarantool-patches 2021-08-09 7:14 ` Kirill Yukhin via Tarantool-patches
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=f5399ea47c4529414462d0eea5f30e54856e82d4.1624918078.git.sergepetrenko@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=sergepetrenko@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 12/12] replication: send current Raft term in join response' \ /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