From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <v.shpilevoy@tarantool.org>
Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [217.69.128.39])
 (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 3EE20469711
 for <tarantool-patches@dev.tarantool.org>;
 Sun,  3 May 2020 21:47:26 +0300 (MSK)
References: <20200428161137.20536-1-gorcunov@gmail.com>
 <20200428161137.20536-13-gorcunov@gmail.com>
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Message-ID: <2741ba0d-e7af-49fe-6b93-220568a4ecce@tarantool.org>
Date: Sun, 3 May 2020 20:47:24 +0200
MIME-Version: 1.0
In-Reply-To: <20200428161137.20536-13-gorcunov@gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Re: [Tarantool-patches] [PATCH 12/17] recovery: recovery_stop_local
 -- don't throw exception
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>, tml <tarantool-patches@dev.tarantool.org>

Thanks for the patch!

On 28/04/2020 18:11, Cyrill Gorcunov wrote:
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
>  src/box/box.cc      | 3 ++-
>  src/box/recovery.cc | 5 +++--
>  src/box/recovery.h  | 2 +-
>  3 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/src/box/box.cc b/src/box/box.cc
> index 31c53a443..01ef3318f 100644
> --- a/src/box/box.cc
> +++ b/src/box/box.cc
> @@ -2307,7 +2307,8 @@ local_recovery(const struct tt_uuid *instance_uuid,
>  				break;
>  			fiber_sleep(0.1);
>  		}
> -		recovery_stop_local(recovery);
> +		if (recovery_stop_local(recovery))
> +		    diag_raise();

Something is wrong with the indentation.

Also better do '!= 0' explicitly. Since this is our code style,
and all the other arguments I provided earlier.