Skip to content

Commit 038785e

Browse files
MDEV-18183 Server startup fails while dropping garbage encrypted tablespace
- There is no need to wait for crypt thread to stop accessing space while dropping the garbage encrypted tablespace during recover.
1 parent 69328c3 commit 038785e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

storage/innobase/fil/fil0crypt.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2413,7 +2413,8 @@ void
24132413
fil_space_crypt_close_tablespace(
24142414
const fil_space_t* space)
24152415
{
2416-
if (!srv_encrypt_tables || !space->crypt_data) {
2416+
if (!srv_encrypt_tables || !space->crypt_data
2417+
|| srv_n_fil_crypt_threads == 0) {
24172418
return;
24182419
}
24192420

storage/xtradb/fil/fil0crypt.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2413,7 +2413,8 @@ void
24132413
fil_space_crypt_close_tablespace(
24142414
const fil_space_t* space)
24152415
{
2416-
if (!srv_encrypt_tables || !space->crypt_data) {
2416+
if (!srv_encrypt_tables || !space->crypt_data
2417+
|| srv_n_fil_crypt_threads == 0) {
24172418
return;
24182419
}
24192420

0 commit comments

Comments
 (0)