Skip to content

Commit 08d0ea1

Browse files
committed
Follow-up to MDEV-11027: Use recv_sys_t::report()
1 parent b46fa62 commit 08d0ea1

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

storage/innobase/log/log0recv.cc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1770,12 +1770,11 @@ recv_recover_page_func(
17701770
recv_addr->state = RECV_PROCESSED;
17711771

17721772
ut_a(recv_sys->n_addrs > 0);
1773-
if (--recv_sys->n_addrs && recv_sys->progress_time - time >= 15) {
1774-
recv_sys->progress_time = time;
1775-
ut_print_timestamp(stderr);
1776-
fprintf(stderr,
1777-
" InnoDB: To recover: " ULINTPF " pages from log\n",
1778-
recv_sys->n_addrs);
1773+
if (ulint n = --recv_sys->n_addrs) {
1774+
if (recv_sys->report(time)) {
1775+
ib_logf(IB_LOG_LEVEL_INFO,
1776+
"To recover: " ULINTPF " pages from log", n);
1777+
}
17791778
}
17801779

17811780
mutex_exit(&recv_sys->mutex);

storage/xtradb/log/log0recv.cc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1860,12 +1860,11 @@ recv_recover_page_func(
18601860
recv_addr->state = RECV_PROCESSED;
18611861

18621862
ut_a(recv_sys->n_addrs > 0);
1863-
if (--recv_sys->n_addrs && recv_sys->progress_time - time >= 15) {
1864-
recv_sys->progress_time = time;
1865-
ut_print_timestamp(stderr);
1866-
fprintf(stderr,
1867-
" InnoDB: To recover: " ULINTPF " pages from log\n",
1868-
recv_sys->n_addrs);
1863+
if (ulint n = --recv_sys->n_addrs) {
1864+
if (recv_sys->report(time)) {
1865+
ib_logf(IB_LOG_LEVEL_INFO,
1866+
"To recover: " ULINTPF " pages from log", n);
1867+
}
18691868
}
18701869

18711870
mutex_exit(&recv_sys->mutex);

0 commit comments

Comments
 (0)