mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 23:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Recovery cleanup

Browse source 
recv_sys_t::report_progress(): Display the largest currently known LSN.

recv_scan_log(): Display an error with fewer function calls.

Reviewed by: Debarun Banerjee
This commit is contained in:
Marko Mäkelä 2025-04-10 12:58:10 +03:00
commit 0bcc03a2e6
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
storage/innobase/log/log0recv.cc
View file

@ -3559,13 +3559,14 @@ void recv_sys_t::report_progress() const
}
else
{
const lsn_t end{std::max(recv_sys.scanned_lsn, recv_sys.file_checkpoint)};
sql_print_information("InnoDB: To recover: LSN " LSN_PF
"/" LSN_PF "; %zu pages",
recv_sys.lsn, recv_sys.scanned_lsn, n);
recv_sys.lsn, end, n);
service_manager_extend_timeout(INNODB_EXTEND_TIMEOUT_INTERVAL,
"To recover: LSN " LSN_PF
"/" LSN_PF "; %zu pages",
recv_sys.lsn, recv_sys.scanned_lsn, n);
recv_sys.lsn, end, n);
}
}
@ -4106,8 +4107,8 @@ static bool recv_scan_log(bool last_phase)
{log_sys.buf + recv_sys.len, size}))
{
mysql_mutex_unlock(&recv_sys.mutex);
ib::error() << "Failed to read log at " << source_offset
<< ": " << err;
sql_print_error("InnoDB: Failed to read log at %" PRIu64 ": %s",
source_offset, ut_strerr(err));
recv_sys.set_corrupt_log();
mysql_mutex_lock(&recv_sys.mutex);
}