[Tarantool-patches] [PATCH 12/17] recovery: recovery_stop_local -- don't throw exception

Vladislav Shpilevoy v.shpilevoy at tarantool.org
Sun May 3 21:47:24 MSK 2020


Thanks for the patch!

On 28/04/2020 18:11, Cyrill Gorcunov wrote:
> Signed-off-by: Cyrill Gorcunov <gorcunov at 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.


More information about the Tarantool-patches mailing list