summaryrefslogtreecommitdiff
path: root/storage/innobase/fil
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-05-13 23:11:50 +0300
committerMonty <monty@mariadb.org>2020-05-23 12:29:10 +0300
commitdcc0baf5405b220384b9e1e07d8b9e3ff97b60f4 (patch)
treec78e85cbf852d98e5928ac27a6262dcc92a92d12 /storage/innobase/fil
parent4ea171ffab8a82cc9d57c275a6cd5e02f6360a40 (diff)
downloadmariadb-git-dcc0baf5405b220384b9e1e07d8b9e3ff97b60f4.tar.gz
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
Diffstat (limited to 'storage/innobase/fil')
-rw-r--r--storage/innobase/fil/fil0fil.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index b71626aa0cd..4b61edaccc3 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);
}