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

MariaDB · Dec 13, 2017 · 08d0ea1 · 08d0ea1
1 parent b46fa62
commit 08d0ea1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
@@ -1770,12 +1770,11 @@ recv_recover_page_func(
 	recv_addr->state = RECV_PROCESSED;
 
 	ut_a(recv_sys->n_addrs > 0);
-	if (--recv_sys->n_addrs && recv_sys->progress_time - time >= 15) {
-		recv_sys->progress_time = time;
-		ut_print_timestamp(stderr);
-		fprintf(stderr,
-			"  InnoDB: To recover: " ULINTPF " pages from log\n",
-			recv_sys->n_addrs);
+	if (ulint n = --recv_sys->n_addrs) {
+		if (recv_sys->report(time)) {
+			ib_logf(IB_LOG_LEVEL_INFO,
+				"To recover: " ULINTPF " pages from log", n);
+		}
 	}
 
 	mutex_exit(&recv_sys->mutex);

diff --git a/storage/xtradb/log/log0recv.cc b/storage/xtradb/log/log0recv.cc
@@ -1860,12 +1860,11 @@ recv_recover_page_func(
 	recv_addr->state = RECV_PROCESSED;
 
 	ut_a(recv_sys->n_addrs > 0);
-	if (--recv_sys->n_addrs && recv_sys->progress_time - time >= 15) {
-		recv_sys->progress_time = time;
-		ut_print_timestamp(stderr);
-		fprintf(stderr,
-			"  InnoDB: To recover: " ULINTPF " pages from log\n",
-			recv_sys->n_addrs);
+	if (ulint n = --recv_sys->n_addrs) {
+		if (recv_sys->report(time)) {
+			ib_logf(IB_LOG_LEVEL_INFO,
+				"To recover: " ULINTPF " pages from log", n);
+		}
 	}
 
 	mutex_exit(&recv_sys->mutex);