summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-12-01 15:35:16 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-12-01 15:35:16 +0200
commit24c9785a67dda85f8df8a3fde4c4903e09f846e9 (patch)
treeec2bc07657c2d8a6b058168e2292e6de26697cfe /extra
parent5b697c5a23ed7322b5b746b61e3ec66b510ca134 (diff)
parent40bf5c951b6f1241bcb59e3be5303057282079e8 (diff)
downloadmariadb-git-24c9785a67dda85f8df8a3fde4c4903e09f846e9.tar.gz
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index c0b79f01cd5..90a0c829773 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -2401,8 +2401,15 @@ xtrabackup_copy_logfile(copy_logfile copy)
log_mutex_enter();
- lsn_t lsn = log_group_read_log_seg(log_sys->buf, &log_sys->log,
- start_lsn, end_lsn);
+ lsn_t lsn= start_lsn;
+ for(int retries= 0; retries < 100; retries++) {
+ if (log_group_read_log_seg(log_sys->buf, &log_sys->log,
+ &lsn, end_lsn)){
+ break;
+ }
+ msg("Retrying read of a redo log block");
+ my_sleep(1000);
+ }
start_lsn = xtrabackup_copy_log(copy, start_lsn, lsn);