Tarantool development patches archive
 help / color / mirror / Atom feed
From: Serge Petrenko via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>, gorcunov@gmail.com
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v4 13/12] replication: send accumulated Raft messages after relay start
Date: Wed, 21 Apr 2021 08:59:19 +0300	[thread overview]
Message-ID: <31ba9d2c-ea94-ba74-44b3-207d912dacca@tarantool.org> (raw)
In-Reply-To: <6e612f9a-b8bf-07fb-5964-f6cc7c8494c0@tarantool.org>



21.04.2021 01:31, Vladislav Shpilevoy пишет:
> Thanks for the patch!
>
> As discussed in private, there is a way to drop this flag, which I
> did in a separate commit on top of this one, see below and on the
> branch sp/gh-5445-election-fixes-review:

Yes, thanks for reviewing this!

Squashed.

> ====================
>      [tosquash] Remove flag do_restart_recovery
>
> diff --git a/src/box/relay.cc b/src/box/relay.cc
> index 85f335cd7..ff43c2fc7 100644
> --- a/src/box/relay.cc
> +++ b/src/box/relay.cc
> @@ -95,7 +95,6 @@ struct relay_raft_msg {
>   	struct cmsg_hop route[2];
>   	struct raft_request req;
>   	struct vclock vclock;
> -	bool do_restart_recovery;
>   	struct relay *relay;
>   };
>   
> @@ -433,6 +432,12 @@ relay_final_join(int fd, uint64_t sync, struct vclock *start_vclock,
>   		relay_delete(relay);
>   	});
>   
> +	/*
> +	 * Save the first vclock as 'received'. Because firstly, it was really
> +	 * received. Secondly, recv_vclock is used by recovery restart and must
> +	 * always be valid.
> +	 */
> +	vclock_copy(&relay->recv_vclock, start_vclock);
>   	relay->r = recovery_new(wal_dir(), false, start_vclock);
>   	vclock_copy(&relay->stop_vclock, stop_vclock);
>   
> @@ -660,13 +665,12 @@ struct relay_is_raft_enabled_msg {
>   };
>   
>   static void
> -relay_push_raft_msg(struct relay *relay, bool do_restart_recovery)
> +relay_push_raft_msg(struct relay *relay)
>   {
>   	if (!relay->tx.is_raft_enabled || relay->tx.is_raft_push_sent)
>   		return;
>   	struct relay_raft_msg *msg =
>   		&relay->tx.raft_msgs[relay->tx.raft_ready_msg];
> -	msg->do_restart_recovery = do_restart_recovery;
>   	cpipe_push(&relay->relay_pipe, &msg->base);
>   	relay->tx.raft_ready_msg = (relay->tx.raft_ready_msg + 1) % 2;
>   	relay->tx.is_raft_push_sent = true;
> @@ -681,16 +685,9 @@ tx_set_is_raft_enabled(struct cmsg *base)
>   		(struct relay_is_raft_enabled_msg *)base;
>   	struct relay *relay  = msg->relay;
>   	relay->tx.is_raft_enabled = msg->value;
> -	/*
> -	 * Send saved raft message as soon as relay becomes operational.
> -	 * Do not restart recovery upon the message arrival. Recovery is
> -	 * positioned at replica_clock initially, i.e. already "restarted" and
> -	 * restarting it once again would position it at the oldest xlog
> -	 * possible, because relay reader hasn't received replica vclock yet.
> -	 */
> -	if (relay->tx.is_raft_push_pending) {
> -		relay_push_raft_msg(msg->relay, false);
> -	}
> +	/* Send saved raft message as soon as relay becomes operational. */
> +	if (relay->tx.is_raft_push_pending)
> +		relay_push_raft_msg(msg->relay);
>   }
>   
>   /** Relay thread part of the Raft flag setting, second hop. */
> @@ -901,6 +898,12 @@ relay_subscribe(struct replica *replica, int fd, uint64_t sync,
>   	});
>   
>   	vclock_copy(&relay->local_vclock_at_subscribe, &replicaset.vclock);
> +	/*
> +	 * Save the first vclock as 'received'. Because firstly, it was really
> +	 * received. Secondly, recv_vclock is used by recovery restart and must
> +	 * always be valid.
> +	 */
> +	vclock_copy(&relay->recv_vclock, replica_clock);
>   	relay->r = recovery_new(wal_dir(), false, replica_clock);
>   	vclock_copy(&relay->tx.vclock, replica_clock);
>   	relay->version_id = replica_version_id;
> @@ -1003,8 +1006,7 @@ relay_raft_msg_push(struct cmsg *base)
>   		 * would be ignored again.
>   		 */
>   		relay_send(msg->relay, &row);
> -		if (msg->req.state == RAFT_STATE_LEADER &&
> -		    msg->do_restart_recovery)
> +		if (msg->req.state == RAFT_STATE_LEADER)
>   			relay_restart_recovery(msg->relay);
>   	} catch (Exception *e) {
>   		relay_set_error(msg->relay, e);
> @@ -1018,7 +1020,7 @@ tx_raft_msg_return(struct cmsg *base)
>   	struct relay_raft_msg *msg = (struct relay_raft_msg *)base;
>   	msg->relay->tx.is_raft_push_sent = false;
>   	if (msg->relay->tx.is_raft_push_pending)
> -		relay_push_raft_msg(msg->relay, true);
> +		relay_push_raft_msg(msg->relay);
>   }
>   
>   void
> @@ -1042,7 +1044,7 @@ relay_push_raft(struct relay *relay, const struct raft_request *req)
>   	cmsg_init(&msg->base, msg->route);
>   	msg->relay = relay;
>   	relay->tx.is_raft_push_pending = true;
> -	relay_push_raft_msg(relay, true);
> +	relay_push_raft_msg(relay);
>   }
>   
>   /** Send a single row to the client. */

-- 
Serge Petrenko


  reply	other threads:[~2021-04-21  5:59 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-16 16:25 [Tarantool-patches] [PATCH v4 00/12] raft: introduce manual elections and fix a bug with re-applying rolled back transactions Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 01/12] wal: make wal_assign_lsn accept journal entry Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 02/12] xrow: enrich row's meta information with sync replication flags Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 03/12] xrow: introduce a PROMOTE entry Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 04/12] box: actualise iproto_key_type array Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 05/12] box: make clear_synchro_queue() write a PROMOTE entry instead of CONFIRM + ROLLBACK Serge Petrenko via Tarantool-patches
2021-04-16 22:12   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-18  8:24     ` Serge Petrenko via Tarantool-patches
2021-04-20 22:30   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-21  5:58     ` Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 06/12] box: write PROMOTE even for empty limbo Serge Petrenko via Tarantool-patches
2021-04-19 13:39   ` Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 07/12] raft: filter rows based on known peer terms Serge Petrenko via Tarantool-patches
2021-04-16 22:21   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-18  8:49     ` Serge Petrenko via Tarantool-patches
2021-04-18 15:44     ` Vladislav Shpilevoy via Tarantool-patches
2021-04-19  9:31       ` Serge Petrenko via Tarantool-patches
2021-04-18 16:27   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-19  9:30     ` Serge Petrenko via Tarantool-patches
2021-04-20 20:29   ` Serge Petrenko via Tarantool-patches
2021-04-20 20:31     ` Serge Petrenko via Tarantool-patches
2021-04-20 20:55       ` Serge Petrenko via Tarantool-patches
2021-04-20 22:30       ` Vladislav Shpilevoy via Tarantool-patches
2021-04-21  5:58         ` Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 08/12] election: introduce a new election mode: "manual" Serge Petrenko via Tarantool-patches
2021-04-19 22:34   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-20  9:25     ` Serge Petrenko via Tarantool-patches
2021-04-20 17:37       ` Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 09/12] raft: introduce raft_start/stop_candidate Serge Petrenko via Tarantool-patches
2021-04-16 22:23   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-18  8:59     ` Serge Petrenko via Tarantool-patches
2021-04-19 22:35       ` Vladislav Shpilevoy via Tarantool-patches
2021-04-20  9:28         ` Serge Petrenko via Tarantool-patches
2021-04-19 12:52   ` Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 10/12] election: support manual elections in clear_synchro_queue() Serge Petrenko via Tarantool-patches
2021-04-16 22:24   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-18  9:26     ` Serge Petrenko via Tarantool-patches
2021-04-18 16:07       ` Vladislav Shpilevoy via Tarantool-patches
2021-04-19  9:32         ` Serge Petrenko via Tarantool-patches
2021-04-19 12:47   ` Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 11/12] box: remove parameter from clear_synchro_queue Serge Petrenko via Tarantool-patches
2021-04-16 16:25 ` [Tarantool-patches] [PATCH v4 12/12] box.ctl: rename clear_synchro_queue to promote Serge Petrenko via Tarantool-patches
2021-04-19 22:35   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-20 10:22     ` Serge Petrenko via Tarantool-patches
2021-04-18 12:00 ` [Tarantool-patches] [PATCH v4 13/12] replication: send accumulated Raft messages after relay start Serge Petrenko via Tarantool-patches
2021-04-18 16:03   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-19 12:11     ` Serge Petrenko via Tarantool-patches
2021-04-19 22:36       ` Vladislav Shpilevoy via Tarantool-patches
2021-04-20 10:38         ` Serge Petrenko via Tarantool-patches
2021-04-20 22:31           ` Vladislav Shpilevoy via Tarantool-patches
2021-04-21  5:59             ` Serge Petrenko via Tarantool-patches [this message]
2021-04-19 22:37 ` [Tarantool-patches] [PATCH v4 00/12] raft: introduce manual elections and fix a bug with re-applying rolled back transactions Vladislav Shpilevoy via Tarantool-patches
2021-04-20 17:38 ` [Tarantool-patches] [PATCH v4 14/12] txn: make NOPs fully asynchronous Serge Petrenko via Tarantool-patches
2021-04-20 22:31   ` Vladislav Shpilevoy via Tarantool-patches
2021-04-21  5:59     ` Serge Petrenko via Tarantool-patches
2021-04-20 22:30 ` [Tarantool-patches] [PATCH v4 00/12] raft: introduce manual elections and fix a bug with re-applying rolled back transactions Vladislav Shpilevoy via Tarantool-patches
2021-04-21  6:01   ` Serge Petrenko 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=31ba9d2c-ea94-ba74-44b3-207d912dacca@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 v4 13/12] replication: send accumulated Raft messages after relay start' \
    /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