From 04ca80926c3aa38f8e4cbddc0e31d6750173ac0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 31 Dec 2020 10:24:26 +0100 Subject: [PATCH] cloning: Wait for 15m instead of 5m before dropping snapshot 5m is too short to allow resumption in some cases where the network has a short moment of instability. Increasing this to 15m isn't adding too much overhead and could avoid having to copy multiple terabytes again. --- storage/innobase/clone/clone0api.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/innobase/clone/clone0api.cc b/storage/innobase/clone/clone0api.cc index be12932624c..dfe0d9bf137 100644 --- a/storage/innobase/clone/clone0api.cc +++ b/storage/innobase/clone/clone0api.cc @@ -573,8 +573,8 @@ int innodb_clone_end(handlerton *hton, THD *thd, const byte *loc, uint loc_len, Clone_Msec sleep_time(Clone_Sec(1)); /* Generate alert message every minute. */ Clone_Sec alert_interval(Clone_Min(1)); - /* Wait for 5 minutes for client to reconnect back */ - Clone_Sec time_out(Clone_Min(5)); + /* Wait for 15 minutes for client to reconnect back */ + Clone_Sec time_out(Clone_Min(15)); bool is_timeout = false; auto err = Clone_Sys::wait( @@ -618,7 +618,7 @@ int innodb_clone_end(handlerton *hton, THD *thd, const byte *loc, uint loc_len, if (err == 0 && is_timeout && clone_hdl->is_idle()) { ib::info(ER_IB_CLONE_TIMEOUT) << "Clone End Master wait " "for restart timed out after " - "5 Minutes. Dropping Snapshot"; + "15 Minutes. Dropping Snapshot"; } /* Last task should drop the clone handle. */ clone_sys->drop_clone(clone_hdl);