[Tarantool-patches] [PATCH 01/17] recovery: do not call recovery_stop_local inside recovery_delete
Cyrill Gorcunov
gorcunov at gmail.com
Tue Apr 28 19:11:21 MSK 2020
From: Georgy Kirichenko <georgy at 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, #3794
---
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 c01b08613..1c6fa582c 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -2294,8 +2294,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 d1a503cfc..1d0e80057 100644
--- a/src/box/recovery.cc
+++ b/src/box/recovery.cc
@@ -216,7 +216,7 @@ recovery_open_log(struct recovery *r, const struct vclock *vclock)
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.20.1
More information about the Tarantool-patches
mailing list