diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 10:41:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 10:41:06 +0300 |
| commit | eb38b1f703fb84299680f9c5a75ea970be7aee1d (patch) | |
| tree | 79bfdb12ef741c3a12ddb025ba6b73098eb1912a | |
| parent | e05650e6868eab2dbb9f58c4786bcc71afc4ffce (diff) | |
| download | mariadb-git-eb38b1f703fb84299680f9c5a75ea970be7aee1d.tar.gz | |
Revert "MDEV-23776 Test encryption.create_or_replace fails with a warning"
This reverts commit e33f7b6faaacf49881fd913115b0735c62aba395.
The change seems to have introduced intermittent failures of the test
encryption.innodb-bad-key-change on many platforms.
The failure that we were trying to address was not reproduced on 10.2.
It could be related to commit a7dd7c899356b2d3a7f79e6ebba5d854ed63ae9d
(MDEV-23651) or de942c9f618b590a01a7960c171d7e50e435708f (MDEV-15983)
or other changes that reduced contention on fil_system.mutex in 10.3.
The fix that we are hereby reverting from 10.2 seems to work fine
on 10.3 and 10.4.
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 16b2093b691..09f2730edec 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -1483,11 +1483,6 @@ static bool fil_crypt_find_space_to_rotate( { /* we need iops to start rotating */ while (!state->should_shutdown() && !fil_crypt_alloc_iops(state)) { - if (state->space && state->space->is_stopping()) { - fil_space_release(state->space); - state->space = NULL; - } - os_event_reset(fil_crypt_threads_event); os_event_wait_time(fil_crypt_threads_event, 100000); } @@ -2511,7 +2506,6 @@ fil_space_crypt_close_tablespace( /* wakeup throttle (all) sleepers */ os_event_set(fil_crypt_throttle_sleep_event); - os_event_set(fil_crypt_threads_event); os_thread_sleep(20000); dict_mutex_enter_for_mysql(); |