From 1136c8d366a6ad7b8d487194fb01c0a5bb072220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 1 Sep 2017 22:07:43 +0300 Subject: Follow-up to MDEV-13570 Assertion failure !srv_read_only_mode in --innodb-read-only shutdown when buf_resize_thread is active logs_empty_and_mark_files_at_shutdown(): Actually skip the debug assertion when the buf_resize_thread is active. The previous fix skipped the debug assertion failure when buf_dump_thread is active. Both these threads are created also in innodb_read_only mode. Depending on how fast these threads react to the shutdown signal, the debug assertion could be triggered. There is no impact on non-debug servers, and very little impact on debug servers either, because in innodb_read_only shutdown, no InnoDB files will need to be written. --- storage/innobase/log/log0log.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 0d0e84ab555..463914982cf 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -1937,6 +1937,7 @@ loop: thread_name = "srv_monitor_thread"; } else if (srv_buf_resize_thread_active) { thread_name = "buf_resize_thread"; + goto wait_suspend_loop; } else if (srv_dict_stats_thread_active) { thread_name = "dict_stats_thread"; } else if (lock_sys && lock_sys->timeout_thread_active) { -- cgit v1.2.1