Commit 1136c8d3 authored by Marko Mäkelä's avatar Marko Mäkelä

Follow-up to MDEV-13570 Assertion failure !srv_read_only_mode in...

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.
parent b660584b
...@@ -1937,6 +1937,7 @@ logs_empty_and_mark_files_at_shutdown(void) ...@@ -1937,6 +1937,7 @@ logs_empty_and_mark_files_at_shutdown(void)
thread_name = "srv_monitor_thread"; thread_name = "srv_monitor_thread";
} else if (srv_buf_resize_thread_active) { } else if (srv_buf_resize_thread_active) {
thread_name = "buf_resize_thread"; thread_name = "buf_resize_thread";
goto wait_suspend_loop;
} else if (srv_dict_stats_thread_active) { } else if (srv_dict_stats_thread_active) {
thread_name = "dict_stats_thread"; thread_name = "dict_stats_thread";
} else if (lock_sys && lock_sys->timeout_thread_active) { } else if (lock_sys && lock_sys->timeout_thread_active) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment