From c42821b9fc4485b63e22c1b8901f522533d92579 Mon Sep 17 00:00:00 2001 From: Vlad Lesin Date: Mon, 18 Jan 2021 12:48:37 +0300 Subject: MDEV-24612 innodb hangs if it's initialization is broken before encryption threads are started Do not init encryption threads if shutdown is in progress. There is no test case for it yet. --- storage/innobase/fil/fil0crypt.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 68a8a9be261..b3e4338da4a 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -2300,6 +2300,8 @@ fil_crypt_set_thread_cnt( const uint new_cnt) { if (!fil_crypt_threads_inited) { + if (srv_shutdown_state != SRV_SHUTDOWN_NONE) + return; fil_crypt_threads_init(); } -- cgit v1.2.1