From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <kostja.osipov@gmail.com>
Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com
 [209.85.208.194])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id D7936469719
 for <tarantool-patches@dev.tarantool.org>;
 Sat,  7 Mar 2020 00:27:09 +0300 (MSK)
Received: by mail-lj1-f194.google.com with SMTP id f10so3713144ljn.6
 for <tarantool-patches@dev.tarantool.org>;
 Fri, 06 Mar 2020 13:27:09 -0800 (PST)
Date: Sat, 7 Mar 2020 00:27:07 +0300
From: Konstantin Osipov <kostja.osipov@gmail.com>
Message-ID: <20200306212707.GA8140@atlas>
References: <20200305122943.7324-1-gorcunov@gmail.com>
 <20200305122943.7324-2-gorcunov@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200305122943.7324-2-gorcunov@gmail.com>
Subject: Re: [Tarantool-patches] [PATCH 01/10] box: recovery_journal_create
	-- set journal here
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: tml <tarantool-patches@dev.tarantool.org>

* Cyrill Gorcunov <gorcunov@gmail.com> [20/03/05 15:32]:
> Allows to eliminate code duplication.

Yet recovery_journal_create() now does two things - creates and
sets a journal.
Then the next step is to move the declaration of struct
recovery_journal to this function and make this declaration static? 

static recovery_journal journal;
journal->vclock = v;
journal_set(&journal);


Anyway, this is unimportant, so lgtm.

> 
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
>  src/box/box.cc | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/src/box/box.cc b/src/box/box.cc
> index 09dd67ab4..eb5931e37 100644
> --- a/src/box/box.cc
> +++ b/src/box/box.cc
> @@ -331,6 +331,7 @@ recovery_journal_create(struct recovery_journal *journal, struct vclock *v)
>  {
>  	journal_create(&journal->base, recovery_journal_write, NULL);
>  	journal->vclock = v;
> +	journal_set(&journal->base);
>  }
>  
>  static void
> @@ -2055,7 +2056,6 @@ bootstrap_from_master(struct replica *master)
>  	engine_begin_final_recovery_xc();
>  	struct recovery_journal journal;
>  	recovery_journal_create(&journal, &replicaset.vclock);
> -	journal_set(&journal.base);
>  
>  	if (!replication_anon) {
>  		applier_resume_to_state(applier, APPLIER_JOINED,
> @@ -2221,7 +2221,6 @@ local_recovery(const struct tt_uuid *instance_uuid,
>  
>  	struct recovery_journal journal;
>  	recovery_journal_create(&journal, &recovery->vclock);
> -	journal_set(&journal.base);
>  
>  	/*
>  	 * We explicitly request memtx to recover its

-- 
Konstantin Osipov, Moscow, Russia