From dcc0baf5405b220384b9e1e07d8b9e3ff97b60f4 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Wed, 13 May 2020 23:11:50 +0300
Subject: [PATCH] Don't print "Trying to delete tablespace several 10x times
 per second"

Now this InnoDB message is printed after one second of stalled operations
and then every 10 seconds
---
 storage/innobase/fil/fil0fil.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index b71626aa0cd62..4b61edaccc36e 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -2024,7 +2024,8 @@ static ulint fil_check_pending_ops(const fil_space_t* space, ulint count)
 
 	if (ulint n_pending_ops = space->n_pending_ops) {
 
-		if (count > 5000) {
+          /* Give a warning every 10 second, starting after 1 second */
+          if ((count % 500) == 50) {
 			ib::warn() << "Trying to delete"
 				" tablespace '" << space->name
 				<< "' but there are " << n_pending_ops
@@ -2071,7 +2072,8 @@ fil_check_pending_io(
 
 		ut_a(!(*node)->being_extended);
 
-		if (count > 1000) {
+                /* Give a warning every 10 second, starting after 1 second */
+		if ((count % 500) == 50) {
 			ib::warn() << "Trying to delete"
 				" tablespace '" << space->name
 				<< "' but there are "
@@ -2130,7 +2132,7 @@ fil_check_pending_operations(
 		mutex_exit(&fil_system.mutex);
 
 		if (count > 0) {
-			os_thread_sleep(20000);
+			os_thread_sleep(20000); // Wait 0.02 seconds
 		}
 
 		mutex_enter(&fil_system.mutex);
@@ -2160,7 +2162,7 @@ fil_check_pending_operations(
 			break;
 		}
 
-		os_thread_sleep(20000);
+		os_thread_sleep(20000);         // Wait 0.02 seconds
 		mutex_enter(&fil_system.mutex);
 	}