From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp60.i.mail.ru (smtp60.i.mail.ru [217.69.128.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 03BDE430409 for ; Fri, 28 Aug 2020 13:11:01 +0300 (MSK) References: <82f89c29-2cce-4a5d-9698-0a240f4d263c@tarantool.org> From: Sergey Petrenko Message-ID: <93f8a2ab-165e-09c3-f23c-effaacf6e0bf@tarantool.org> Date: Fri, 28 Aug 2020 13:10:59 +0300 MIME-Version: 1.0 In-Reply-To: <82f89c29-2cce-4a5d-9698-0a240f4d263c@tarantool.org> Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit Content-Language: en-GB Subject: Re: [Tarantool-patches] [RAFT 02/10] raft: relay status updates to followers List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy , gorcunov@gmail.com, sergos@tarantool.org Cc: tarantool-patches@dev.tarantool.org 27.08.2020 23:36, Vladislav Shpilevoy пишет: > Hi! Thanks for the patch! Hi! Thanks for the review! >> diff --git a/src/box/relay.cc b/src/box/relay.cc >> index a7843a8c2..be252cad1 100644 >> --- a/src/box/relay.cc >> +++ b/src/box/relay.cc >> @@ -773,13 +774,40 @@ relay_send_initial_join_row(struct xstream *stream, struct xrow_header *row) >> relay_send(relay, row); >> } >> >> +static void >> +relay_send_raft(struct relay *relay, struct raft_request *req) >> +{ >> + struct xrow_header packet; >> + xrow_encode_raft(&packet, &fiber()->gc, req); >> + relay_send(relay, &packet); >> +} >> + >> +static void >> +relay_send_raft_msg(struct cmsg *msg) >> +{ >> + struct raft_broadcast_msg *raft_msg = (struct raft_broadcast_msg *)msg; >> + struct relay *relay = container_of(msg->route[0].pipe, struct relay, >> + tx_pipe); >> + relay_send_raft(relay, &raft_msg->req); >> +} >> + >> +void >> +relay_push_raft_msg(struct relay *relay, struct cmsg *msg, >> + struct cmsg_hop *route) >> +{ >> + route[0].f = relay_send_raft_msg; >> + route[0].pipe = &relay->tx_pipe; >> + route[1].f = raft_free_msg; >> + route[1].pipe = NULL; >> + cmsg_init(msg, route); >> + cpipe_push(&relay->relay_pipe, msg); >> +} >> + >> /** Send a single row to the client. */ >> static void >> relay_send_row(struct xstream *stream, struct xrow_header *packet) >> { >> struct relay *relay = container_of(stream, struct relay, stream); >> - assert(iproto_type_is_dml(packet->type) || >> - iproto_type_is_synchro_request(packet->type)); >> if (packet->group_id == GROUP_LOCAL) { >> /* >> * We do not relay replica-local rows to other >> @@ -796,6 +824,8 @@ relay_send_row(struct xstream *stream, struct xrow_header *packet) >> packet->group_id = GROUP_DEFAULT; >> packet->bodycnt = 0; >> } >> + assert(iproto_type_is_dml(packet->type) || >> + iproto_type_is_synchro_request(packet->type)); > Why did you move this check, if Raft uses relay_send() anyway? Not > relay_send_row(). When relay sends a WAL to the replica, local raft rows end up in relay_send_row(). The rows are not sent, since they're local, but they fail this assertion, so I moved it below the locality check. > >> /* Check if the rows from the instance are filtered. */ >> if ((1 << packet->replica_id & relay->id_filter) != 0) >> return;