From 1b558dd462d34e948f3a4d9e54af973e37a9746e Mon Sep 17 00:00:00 2001 From: Vlad Lesin Date: Fri, 15 Apr 2022 18:21:54 +0300 Subject: MDEV-27919 mariabackup --log-copy-interval is measured in millisecondss in 10.5 and in microseconds in 10.6 Multiply polling interval by 1000. --- extra/mariabackup/backup_copy.cc | 8 ++++++++ extra/mariabackup/xtrabackup.cc | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'extra/mariabackup') diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index ff2ff5bfc4a..ce94ef5864d 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -55,6 +55,7 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA #include "xtrabackup.h" #include "common.h" #include "backup_copy.h" +#include "backup_debug.h" #include "backup_mysql.h" #include @@ -1443,6 +1444,13 @@ bool backup_start(CorruptedPages &corrupted_pages) msg("Waiting for log copy thread to read lsn %llu", (ulonglong)server_lsn_after_lock); backup_wait_for_lsn(server_lsn_after_lock); + DBUG_EXECUTE_FOR_KEY("sleep_after_waiting_for_lsn", {}, + { + ulong milliseconds = strtoul(dbug_val, NULL, 10); + msg("sleep_after_waiting_for_lsn"); + my_sleep(milliseconds*1000UL); + }); + backup_fix_ddl(corrupted_pages); // There is no need to stop slave thread before coping non-Innodb data when diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 4f7dde67c67..e30541c7b4e 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3098,7 +3098,7 @@ static void log_copying_thread() (!metadata_to_lsn || metadata_to_lsn > log_copy_scanned_lsn)) { timespec abstime; - set_timespec_nsec(abstime, 1000ULL * xtrabackup_log_copy_interval); + set_timespec_nsec(abstime, 1000000ULL * xtrabackup_log_copy_interval); mysql_cond_timedwait(&log_copying_stop, &log_sys.mutex, &abstime); } log_copying_running= false; -- cgit v1.2.1