From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98]) (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 AE5EA43040C for ; Fri, 4 Sep 2020 12:22:43 +0300 (MSK) References: <0c95ea354508c81670fb691ab538f3f803bb8e94.1599173312.git.v.shpilevoy@tarantool.org> From: Serge Petrenko Message-ID: Date: Fri, 4 Sep 2020 12:22:42 +0300 MIME-Version: 1.0 In-Reply-To: <0c95ea354508c81670fb691ab538f3f803bb8e94.1599173312.git.v.shpilevoy@tarantool.org> Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit Content-Language: ru Subject: Re: [Tarantool-patches] [PATCH v2 08/10] [tosquash] raft: pass source instance_id to raft_process_msg() List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy , tarantool-patches@dev.tarantool.org, gorcunov@gmail.com 04.09.2020 01:51, Vladislav Shpilevoy пишет: > Instance ID of the sender is needed in order to > > - be able to vote for him; > - be able to remember its ID as leader ID, when it is a leader. > --- > src/box/applier.cc | 9 ++++----- > src/box/raft.c | 3 ++- > src/box/raft.h | 8 ++++++-- > 3 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/src/box/applier.cc b/src/box/applier.cc > index 53db97d6d..5459a1dc1 100644 > --- a/src/box/applier.cc > +++ b/src/box/applier.cc > @@ -898,7 +898,7 @@ err: LGTM. > } > > static int > -apply_raft_row(struct xrow_header *row) > +applier_handle_raft(struct applier *applier, struct xrow_header *row) > { > assert(iproto_type_is_raft_request(row->type)); > > @@ -906,9 +906,7 @@ apply_raft_row(struct xrow_header *row) > struct vclock candidate_clock; > if (xrow_decode_raft(row, &req, &candidate_clock) != 0) > return -1; > - > - raft_process_msg(&req); > - > + raft_process_msg(&req, applier->instance_id); > return 0; > } > > @@ -1262,7 +1260,8 @@ applier_subscribe(struct applier *applier) > if (first_row->lsn == 0) { > if (unlikely(iproto_type_is_raft_request( > first_row->type))) { > - if (apply_raft_row(first_row) != 0) > + if (applier_handle_raft(applier, > + first_row) != 0) > diag_raise(); > } > applier_signal_ack(applier); > diff --git a/src/box/raft.c b/src/box/raft.c > index 7697809ee..4d3d07c48 100644 > --- a/src/box/raft.c > +++ b/src/box/raft.c > @@ -78,8 +78,9 @@ raft_process_recovery(const struct raft_request *req) > } > > void > -raft_process_msg(const struct raft_request *req) > +raft_process_msg(const struct raft_request *req, uint32_t source) > { > + (void)source; > if (req->term > raft.term) { > // Update term. > // The logic will be similar, but the code > diff --git a/src/box/raft.h b/src/box/raft.h > index e3261454b..db64cf933 100644 > --- a/src/box/raft.h > +++ b/src/box/raft.h > @@ -70,9 +70,13 @@ raft_is_enabled(void) > void > raft_process_recovery(const struct raft_request *req); > > -/** Process a raft status message coming from the network. */ > +/** > + * Process a raft status message coming from the network. > + * @param req Raft request. > + * @param source Instance ID of the message sender. > + */ > void > -raft_process_msg(const struct raft_request *req); > +raft_process_msg(const struct raft_request *req, uint32_t source); > > /** Configure whether Raft is enabled. */ > void -- Serge Petrenko