1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV-14701: install_db shows corruption for rest encryption with innodb_data_file_path=ibdata1:3M

Browse Source 
Problem was that crypt_data->min_key_version is not a reliable way
to detect is tablespace encrypted and could lead that in first page
of the second (page 192 and similarly for other files if more configured)
system tablespace file used key_version is replaced with zero leading
a corruption as in next startup page is though to be corrupted.
Note that crypt_data->min_key_version is updated only after all
pages from tablespace have been processed (i.e. key rotation is done)
and flushed.

fil_write_flushed_lsn
        Use crypt_data->should_encrypt() instead.
This commit is contained in:
Jan Lindström 2017-12-19 16:45:10 +02:00
parent 252e690c85
commit ed7e4b68ed
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/fil/fil0fil.cc
View File

@ -2085,7 +2085,9 @@ fil_write_flushed_lsn(
/* If tablespace is not encrypted, stamp flush_lsn to
first page of all system tablespace datafiles to avoid
unnecessary error messages on possible downgrade. */
if (!space->crypt_data || space->crypt_data->min_key_version == 0) {
if (!space->crypt_data
|| !space->crypt_data->should_encrypt()) {
fil_node_t* node;
ulint sum_of_sizes = 0;

3
storage/xtradb/fil/fil0fil.cc
View File

@ -2136,7 +2136,8 @@ fil_write_flushed_lsn(
/* If tablespace is not encrypted, stamp flush_lsn to
first page of all system tablespace datafiles to avoid
unnecessary error messages on possible downgrade. */
if (!space->crypt_data || space->crypt_data->min_key_version == 0) {
if (!space->crypt_data
|| !space->crypt_data->should_encrypt()) {
fil_node_t* node;
ulint sum_of_sizes = 0;