Skip to content

M
MariaDB
Commit 08d0ea1f authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Follow-up to MDEV-11027: Use recv_sys_t::report()

parent b46fa627
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 12 deletions
storage/innobase/log/log0recv.cc
View file @ 08d0ea1f
...@@ -1770,12 +1770,11 @@ recv_recover_page_func( ...@@ -1770,12 +1770,11 @@ recv_recover_page_func(
recv_addr->state = RECV_PROCESSED; recv_addr->state = RECV_PROCESSED;
ut_a(recv_sys->n_addrs > 0); ut_a(recv_sys->n_addrs > 0);
if (--recv_sys->n_addrs && recv_sys->progress_time - time >= 15) { if (ulint n = --recv_sys->n_addrs) {
recv_sys->progress_time = time; if (recv_sys->report(time)) {
ut_print_timestamp(stderr); ib_logf(IB_LOG_LEVEL_INFO,
fprintf(stderr, "To recover: " ULINTPF " pages from log", n);
" InnoDB: To recover: " ULINTPF " pages from log\n", }
recv_sys->n_addrs);
} }
mutex_exit(&recv_sys->mutex); mutex_exit(&recv_sys->mutex);
......
storage/xtradb/log/log0recv.cc
View file @ 08d0ea1f
...@@ -1860,12 +1860,11 @@ recv_recover_page_func( ...@@ -1860,12 +1860,11 @@ recv_recover_page_func(
recv_addr->state = RECV_PROCESSED; recv_addr->state = RECV_PROCESSED;
ut_a(recv_sys->n_addrs > 0); ut_a(recv_sys->n_addrs > 0);
if (--recv_sys->n_addrs && recv_sys->progress_time - time >= 15) { if (ulint n = --recv_sys->n_addrs) {
recv_sys->progress_time = time; if (recv_sys->report(time)) {
ut_print_timestamp(stderr); ib_logf(IB_LOG_LEVEL_INFO,
fprintf(stderr, "To recover: " ULINTPF " pages from log", n);
" InnoDB: To recover: " ULINTPF " pages from log\n", }
recv_sys->n_addrs);
} }
mutex_exit(&recv_sys->mutex); mutex_exit(&recv_sys->mutex);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7