diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 22:07:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 22:07:43 +0300 |
| commit | 1136c8d366a6ad7b8d487194fb01c0a5bb072220 (patch) | |
| tree | 782137843ea7d432f1440ae373e3702ad358e2c3 | |
| parent | b660584b108544cd36b734d724b2f3a6bc98ebfa (diff) | |
| download | mariadb-git-1136c8d366a6ad7b8d487194fb01c0a5bb072220.tar.gz | |
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.
| -rw-r--r-- | storage/innobase/log/log0log.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |