diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-29 14:23:34 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-31 08:36:56 +0300 |
commit | eca238aea7925b3f165db7c8a0e03c5b3b179cf9 (patch) | |
tree | 9686c818f33aebfb223a7c508507d75f81595b1e /storage/innobase/fsp/fsp0sysspace.cc | |
parent | 43b262af55db507320b165bb0f9abf05b2f05a89 (diff) | |
download | mariadb-git-eca238aea7925b3f165db7c8a0e03c5b3b179cf9.tar.gz |
MDEV-13557: Startup failure, unable to decrypt ibdata1
Fixes also MDEV-13488: InnoDB writes CRYPT_INFO even though
encryption is not enabled.
Fixes also MDEV-13093: Leak of Datafile::m_crypt_info on
shutdown after failed startup.
Problem was that we created encryption metadata (crypt_data) for
system tablespace even when no encryption was enabled and too early.
System tablespace can be encrypted only using key rotation.
Test innodb-key-rotation-disable, innodb_encryption, innodb_lotoftables
require adjustment because INFORMATION_SCHEMA INNODB_TABLESPACES_ENCRYPTION
contain row only if tablespace really has encryption metadata.
xb_load_single_table_tablespace(): Do not call
fil_space_destroy_crypt_data() any more, because Datafile::m_crypt_data
has been removed.
fil_crypt_realloc_iops(): Avoid divide by zero.
fil_crypt_set_thread_cnt(): Set fil_crypt_threads_event if
encryption threads exist. This is required to find tablespaces
requiring key rotation if no other changes happen.
fil_crypt_find_space_to_rotate(): Decrease the amount of time waiting
when nothing happens to better enable key rotation on startup.
fil_ibd_open(), fil_ibd_load(): Load possible crypt_data from first
page.
class Datafile, class SysTablespace : remove m_crypt_info field.
Datafile::get_first_page(): Return a pointer to first page buffer.
fsp_header_init(): Write encryption metadata to page 0 only if
tablespace is encrypted or encryption is disabled by table option.
i_s_dict_fill_tablespaces_encryption(): Skip tablespaces that do not
contain encryption metadata. This is required to avoid too early
wait condition trigger in encrypted -> unencrypted state transfer.
Diffstat (limited to 'storage/innobase/fsp/fsp0sysspace.cc')
-rw-r--r-- | storage/innobase/fsp/fsp0sysspace.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/storage/innobase/fsp/fsp0sysspace.cc b/storage/innobase/fsp/fsp0sysspace.cc index e4bb11c9a22..cc156a5353a 100644 --- a/storage/innobase/fsp/fsp0sysspace.cc +++ b/storage/innobase/fsp/fsp0sysspace.cc @@ -562,8 +562,6 @@ SysTablespace::read_lsn_and_check_flags(lsn_t* flushed_lsn) err = it->read_first_page( m_ignore_read_only ? false : srv_read_only_mode); - m_crypt_info = it->m_crypt_info; - if (err != DB_SUCCESS) { return(err); } @@ -919,19 +917,10 @@ SysTablespace::open_or_create( /* Create the tablespace entry for the multi-file tablespace in the tablespace manager. */ - - if (!m_crypt_info) { - /* Create default crypt info for system - tablespace if it does not yet exists. */ - m_crypt_info = fil_space_create_crypt_data( - FIL_ENCRYPTION_DEFAULT, - FIL_DEFAULT_ENCRYPTION_KEY); - } - space = fil_space_create( name(), space_id(), flags(), is_temp ? FIL_TYPE_TEMPORARY : FIL_TYPE_TABLESPACE, - m_crypt_info); + NULL); } ut_a(fil_validate()); |