diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2019-09-18 19:50:28 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2019-09-18 22:41:44 +0300 |
| commit | 0a512e88102ec9ff807f047b26e87e245e933ae0 (patch) | |
| tree | 26f1575853dd88e90dbedcc80b23fb4da6dccc14 | |
| parent | 0789a1a18f0e780c0412667e7b6e0a9970aa6905 (diff) | |
| download | mariadb-git-bb-10.3.16-xtrabackup_copy_logfile_failed-MDEV-18611-dev.tar.gz | |
Some extra logging is addedbb-10.3.16-xtrabackup_copy_logfile_failed-MDEV-18611-dev
(cherry picked from commit 7ff6e33d7ff7104fefb4df4a33c6f3fa54c0093d)
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 26 |
2 files changed, 25 insertions, 5 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index c06d677786c..b077e7870f9 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2728,7 +2728,11 @@ static bool xtrabackup_copy_logfile(bool last = false) do { end_lsn = start_lsn + RECV_SCAN_SIZE; + DBUG_EXECUTE_IF("ib_log", + msg("xtrabackup_copy_logfile: start throttling");); xtrabackup_io_throttling(); + DBUG_EXECUTE_IF("ib_log", + msg("xtrabackup_copy_logfile: stop throttling");); log_mutex_enter(); lsn_t lsn= start_lsn; diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index 898e57a5f53..e4d1dc0949e 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -941,6 +941,11 @@ loop: const ulint page_no = ulint(source_offset >> srv_page_size_shift); + DBUG_PRINT("ib_log", + ("read_log_seg: start_lsn: " UINT64PF ", source_offset: " UINT64PF + ", at_eof: %d, len: " ULINTPF ", page_no: " ULINTPF, + *start_lsn, source_offset, at_eof, len, page_no)); + fil_io(IORequestLogRead, true, page_id_t(SRV_LOG_SPACE_FIRST_ID, page_no), univ_page_size, @@ -951,8 +956,15 @@ loop: buf += OS_FILE_LOG_BLOCK_SIZE, (*start_lsn) += OS_FILE_LOG_BLOCK_SIZE) { const ulint block_number = log_block_get_hdr_no(buf); + const ulint calculated_block_number = + log_block_convert_lsn_to_no(*start_lsn); + + DBUG_PRINT("ib_log", + ("read_log_seg: iterate " ULINTPF ", block_number: " ULINTPF + ", calculated_block_number: " ULINTPF, + l, block_number, calculated_block_number)); - if (block_number != log_block_convert_lsn_to_no(*start_lsn)) { + if (block_number != calculated_block_number) { /* Garbage or an incompletely written log block. We will not report any error, because this can happen when InnoDB was killed while it was @@ -995,13 +1007,15 @@ fail: if (dl < LOG_BLOCK_HDR_SIZE || (dl > OS_FILE_LOG_BLOCK_SIZE - LOG_BLOCK_TRL_SIZE && dl != OS_FILE_LOG_BLOCK_SIZE)) { + DBUG_PRINT("ib_log", + ("read_log_seg: fail, dl: " ULINTPF, dl)); recv_sys->found_corrupt_log = true; goto fail; } } + ib::info() << "Read redo log up to LSN=" << *start_lsn; if (recv_sys->report(ut_time())) { - ib::info() << "Read redo log up to LSN=" << *start_lsn; service_manager_extend_timeout(INNODB_EXTEND_TIMEOUT_INTERVAL, "Read redo log up to LSN=" LSN_PF, *start_lsn); @@ -1322,9 +1336,11 @@ recv_find_max_checkpoint(ulint* max_field) buf + LOG_CHECKPOINT_NO); DBUG_PRINT("ib_log", - ("checkpoint " UINT64PF " at " LSN_PF " found", - checkpoint_no, mach_read_from_8( - buf + LOG_CHECKPOINT_LSN))); + ("checkpoint " UINT64PF " at " LSN_PF " found, " + "checkpoint offset " UINT64PF, + checkpoint_no, + mach_read_from_8(buf + LOG_CHECKPOINT_LSN), + mach_read_from_8(buf + LOG_CHECKPOINT_OFFSET))); if (checkpoint_no >= max_no) { *max_field = field; |