From: sergepetrenko <sergepetrenko@tarantool.org> To: v.shpilevoy@tarantool.org, georgy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v2 3/5] applier: split join processing into two stages Date: Wed, 25 Dec 2019 15:47:00 +0300 [thread overview] Message-ID: <de0c5bdb9ecb7883711d7dc0cc2bc45808e5eb95.1577277455.git.sergepetrenko@tarantool.org> (raw) In-Reply-To: <cover.1577277455.git.sergepetrenko@tarantool.org> From: Serge Petrenko <sergepetrenko@tarantool.org> We already have 'initial join' and 'final join' stages in applier logic. The first actually means fetching master's snapshot, and the second one -- receiving the rows which should contain replica's registration in _cluster. These stages will be used separately once anonymous replica is implemented, so split them as a preparation. Prerequisite #3186 --- src/box/applier.cc | 65 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/src/box/applier.cc b/src/box/applier.cc index 42374f886..f4f9d0670 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -202,7 +202,7 @@ applier_writer_f(va_list ap) } static int -apply_initial_join_row(struct xrow_header *row) +apply_snapshot_row(struct xrow_header *row) { int rc; struct request request; @@ -388,18 +388,12 @@ done: applier_set_state(applier, APPLIER_READY); } -/** - * Execute and process JOIN request (bootstrap the instance). - */ -static void -applier_join(struct applier *applier) +static uint64_t +applier_wait_snapshot(struct applier *applier) { - /* Send JOIN request */ struct ev_io *coio = &applier->io; struct ibuf *ibuf = &applier->ibuf; struct xrow_header row; - xrow_encode_join_xc(&row, &INSTANCE_UUID); - coio_write_xrow(coio, &row); /** * Tarantool < 1.7.0: if JOIN is successful, there is no "OK" @@ -423,8 +417,6 @@ applier_join(struct applier *applier) xrow_decode_vclock_xc(&row, &replicaset.vclock); } - applier_set_state(applier, APPLIER_INITIAL_JOIN); - /* * Receive initial data. */ @@ -433,7 +425,7 @@ applier_join(struct applier *applier) coio_read_xrow(coio, ibuf, &row); applier->last_row_time = ev_monotonic_now(loop()); if (iproto_type_is_dml(row.type)) { - if (apply_initial_join_row(&row) != 0) + if (apply_snapshot_row(&row) != 0) diag_raise(); if (++row_count % 100000 == 0) say_info("%.1fM rows received", row_count / 1e6); @@ -456,9 +448,16 @@ applier_join(struct applier *applier) (uint32_t) row.type); } } - say_info("initial data received"); - applier_set_state(applier, APPLIER_FINAL_JOIN); + return row_count; +} + +static uint64_t +applier_wait_register(struct applier *applier, uint64_t row_count) +{ + struct ev_io *coio = &applier->io; + struct ibuf *ibuf = &applier->ibuf; + struct xrow_header row; /* * Tarantool < 1.7.0: there is no "final join" stage. @@ -466,7 +465,7 @@ applier_join(struct applier *applier) * until replica id is received. */ if (applier->version_id < version_id(1, 7, 0)) - return; + return row_count; /* * Receive final data. @@ -485,6 +484,7 @@ applier_join(struct applier *applier) * Current vclock. This is not used now, * ignore. */ + ++row_count; break; /* end of stream */ } else if (iproto_type_is_error(row.type)) { xrow_decode_error_xc(&row); /* rethrow error */ @@ -493,6 +493,41 @@ applier_join(struct applier *applier) (uint32_t) row.type); } } + + return row_count; +} + +/** + * Execute and process JOIN request (bootstrap the instance). + */ +static void +applier_join(struct applier *applier) +{ + /* Send JOIN request */ + struct ev_io *coio = &applier->io; + struct xrow_header row; + uint64_t row_count; + + xrow_encode_join_xc(&row, &INSTANCE_UUID); + coio_write_xrow(coio, &row); + + applier_set_state(applier, APPLIER_INITIAL_JOIN); + + row_count = applier_wait_snapshot(applier); + + say_info("initial data received"); + + applier_set_state(applier, APPLIER_FINAL_JOIN); + + if (applier_wait_register(applier, row_count) == row_count) { + /* + * We didn't receive any rows during registration. + * Proceed to "subscribe" and do not finish bootstrap + * until replica id is received. + */ + return; + } + say_info("final data received"); applier_set_state(applier, APPLIER_JOINED); -- 2.20.1 (Apple Git-117)
next prev parent reply other threads:[~2019-12-25 12:49 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-25 12:46 [Tarantool-patches] [PATCH v2 0/5] introduce anonymous replicas sergepetrenko 2019-12-25 12:46 ` [Tarantool-patches] [PATCH v2 1/5] box: update comment describing join protocol sergepetrenko 2019-12-25 12:46 ` [Tarantool-patches] [PATCH v2 2/5] replication: do not decode replicaset uuid when processing a subscribe sergepetrenko 2019-12-25 12:47 ` sergepetrenko [this message] 2019-12-25 12:47 ` [Tarantool-patches] [PATCH v2 4/5] vclock: ignore 0th component in comparisons sergepetrenko 2019-12-25 16:00 ` Vladislav Shpilevoy 2019-12-27 18:42 ` Vladislav Shpilevoy 2019-12-28 11:21 ` Sergey Petrenko 2019-12-25 12:47 ` [Tarantool-patches] [PATCH v2 5/5] replication: introduce anonymous replica sergepetrenko 2019-12-25 18:22 ` Vladislav Shpilevoy 2019-12-27 15:27 ` Sergey Petrenko 2019-12-27 18:42 ` Vladislav Shpilevoy 2019-12-28 11:48 ` Sergey Petrenko 2019-12-28 12:15 ` Vladislav Shpilevoy 2019-12-30 5:12 ` [Tarantool-patches] [PATCH v2 0/5] introduce anonymous replicas 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=de0c5bdb9ecb7883711d7dc0cc2bc45808e5eb95.1577277455.git.sergepetrenko@tarantool.org \ --to=sergepetrenko@tarantool.org \ --cc=georgy@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 3/5] applier: split join processing into two stages' \ /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