From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp33.i.mail.ru (smtp33.i.mail.ru [94.100.177.93]) (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 3841D4696C3 for ; Wed, 12 Feb 2020 12:39:23 +0300 (MSK) From: Georgy Kirichenko Date: Wed, 12 Feb 2020 12:39:10 +0300 Message-Id: <49f33a8165d9de27ed5b852027b5093556fbb06a.1581500169.git.georgy@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v4 01/11] recovery: do not call recovery_stop_local inside recovery_delete List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Recovery stop local raises an exception in case of an recovery error so it is not safe to stop recovery inside recovery delete and guard inside local_recovery. So call recovery_stop_local manually. Part of #980 --- src/box/box.cc | 4 +++- src/box/recovery.cc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 1b2b27d61..68038df18 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -2238,8 +2238,10 @@ local_recovery(const struct tt_uuid *instance_uuid, recovery_follow_local(recovery, &wal_stream.base, "hot_standby", cfg_getd("wal_dir_rescan_delay")); while (true) { - if (path_lock(cfg_gets("wal_dir"), &wal_dir_lock)) + if (path_lock(cfg_gets("wal_dir"), &wal_dir_lock)) { + recovery_stop_local(recovery); diag_raise(); + } if (wal_dir_lock >= 0) break; fiber_sleep(0.1); diff --git a/src/box/recovery.cc b/src/box/recovery.cc index 64aa467b1..a1ac2d967 100644 --- a/src/box/recovery.cc +++ b/src/box/recovery.cc @@ -216,7 +216,7 @@ gap_error: void recovery_delete(struct recovery *r) { - recovery_stop_local(r); + assert(r->watcher == NULL); trigger_destroy(&r->on_close_log); xdir_destroy(&r->wal_dir); -- 2.25.0