MDEV-22577 innodb_fast_shutdown=0 fails to report purge progress

srv_purge_should_exit(): Report progress on slow shutdown
not only to systemd, but also to the error log.

1 files changed, 6 insertions, 4 deletions

diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index 6eb67a1b2d4..9818b20ba6c 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -2516,18 +2516,20 @@ srv_purge_should_exit(ulint n_purged)
 		return(true);
 	}
 	/* Slow shutdown was requested. */
-	if (n_purged) {
-#if defined HAVE_SYSTEMD && !defined EMBEDDED_LIBRARY
+	if (ulint history_size = n_purged ? trx_sys->rseg_history_len : 0) {
 		static time_t progress_time;
 		time_t now = time(NULL);
 		if (now - progress_time >= 15) {
 			progress_time = now;
+#if defined HAVE_SYSTEMD && !defined EMBEDDED_LIBRARY
 			service_manager_extend_timeout(
 				INNODB_EXTEND_TIMEOUT_INTERVAL,
 				"InnoDB: to purge " ULINTPF " transactions",
-				trx_sys->rseg_history_len);
-		}
+				history_size);
 #endif
+			ib::info() << "to purge " << history_size
+				   << " transactions";
+		}
 		/* The previous round still did some work. */
 		return(false);
 	}