mirror of
https://github.com/MariaDB/server.git
synced 2025-08-30 11:22:14 +03:00
50eb40a2a8
MDEV-11581: Mariadb starts InnoDB encryption threads
when key has not changed or data scrubbing turned off
Background: Key rotation is based on background threads
(innodb-encryption-threads) periodically going through
all tablespaces on fil_system. For each tablespace
current used key version is compared to max key age
(innodb-encryption-rotate-key-age). This process
naturally takes CPU. Similarly, in same time need for
scrubbing is investigated. Currently, key rotation
is fully supported on Amazon AWS key management plugin
only but InnoDB does not have knowledge what key
management plugin is used.
This patch re-purposes innodb-encryption-rotate-key-age=0
to disable key rotation and background data scrubbing.
All new tables are added to special list for key rotation
and key rotation is based on sending a event to
background encryption threads instead of using periodic
checking (i.e. timeout).
fil0fil.cc: Added functions fil_space_acquire_low()
to acquire a tablespace when it could be dropped concurrently.
This function is used from fil_space_acquire() or
fil_space_acquire_silent() that will not print
any messages if we try to acquire space that does not exist.
fil_space_release() to release a acquired tablespace.
fil_space_next() to iterate tablespaces in fil_system
using fil_space_acquire() and fil_space_release().
Similarly, fil_space_keyrotation_next() to iterate new
list fil_system->rotation_list where new tables.
are added if key rotation is disabled.
Removed unnecessary functions fil_get_first_space_safe()
fil_get_next_space_safe()
fil_node_open_file(): After page 0 is read read also
crypt_info if it is not yet read.
btr_scrub_lock_dict_func()
buf_page_check_corrupt()
buf_page_encrypt_before_write()
buf_merge_or_delete_for_page()
lock_print_info_all_transactions()
row_fts_psort_info_init()
row_truncate_table_for_mysql()
row_drop_table_for_mysql()
Use fil_space_acquire()/release() to access fil_space_t.
buf_page_decrypt_after_read():
Use fil_space_get_crypt_data() because at this point
we might not yet have read page 0.
fil0crypt.cc/fil0fil.h: Lot of changes. Pass fil_space_t* directly
to functions needing it and store fil_space_t* to rotation state.
Use fil_space_acquire()/release() when iterating tablespaces
and removed unnecessary is_closing from fil_crypt_t. Use
fil_space_t::is_stopping() to detect when access to
tablespace should be stopped. Removed unnecessary
fil_space_get_crypt_data().
fil_space_create(): Inform key rotation that there could
be something to do if key rotation is disabled and new
table with encryption enabled is created.
Remove unnecessary functions fil_get_first_space_safe()
and fil_get_next_space_safe(). fil_space_acquire()
and fil_space_release() are used instead. Moved
fil_space_get_crypt_data() and fil_space_set_crypt_data()
to fil0crypt.cc.
fsp_header_init(): Acquire fil_space_t*, write crypt_data
and release space.
check_table_options()
Renamed FIL_SPACE_ENCRYPTION_* TO FIL_ENCRYPTION_*
i_s.cc: Added ROTATING_OR_FLUSHING field to
information_schema.innodb_tablespace_encryption
to show current status of key rotation.
146 lines
5.3 KiB
Plaintext
146 lines
5.3 KiB
Plaintext
-- source include/have_innodb.inc
|
|
-- source include/have_file_key_management_plugin.inc
|
|
# test uses restart
|
|
-- source include/not_embedded.inc
|
|
|
|
--disable_warnings
|
|
SET GLOBAL innodb_file_format = `Barracuda`;
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;
|
|
CREATE TABLE t2 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB;
|
|
CREATE TABLE t3 (id INT, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;
|
|
CREATE TABLE t4 (id INT, a VARCHAR(255)) engine=InnoDB;
|
|
CREATE TABLE t5 (id INT NOT NULL PRIMARY KEY, a TEXT(500), b VARCHAR(255), FULLTEXT(b)) ENGINE=InnoDB encrypted=yes;
|
|
CREATE TABLE t6 (id INT, a TEXT(500), b VARCHAR(255), FULLTEXT(b)) ENGINE=InnoDB;
|
|
CREATE TABLE t7 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB row_format=compressed encrypted=yes;
|
|
|
|
delimiter //;
|
|
create procedure innodb_insert_proc (repeat_count int)
|
|
begin
|
|
declare current_num int;
|
|
set current_num = 0;
|
|
while current_num < repeat_count do
|
|
insert into t1 values (current_num,repeat('foobar',42));
|
|
insert into t2 values (current_num,repeat('temp', 42));
|
|
insert into t3 values (current_num,repeat('barfoo',42));
|
|
insert into t4 values (current_num,repeat('repeat',42));
|
|
insert into t5 values (current_num,substring('A BC DEF GHIJ KLM NOPQRS TUV WXYZ 012 3456789', rand()*36+1, 100), repeat('author new',22));
|
|
insert into t6 values (current_num,substring('A BC DEF GHIJ KLM NOPQRS TUV WXYZ 012 3456789', rand()*36+1, 100), repeat('mangled old',22));
|
|
insert into t7 values (current_num,repeat('mysql',42));
|
|
set current_num = current_num + 1;
|
|
end while;
|
|
end//
|
|
delimiter ;//
|
|
commit;
|
|
|
|
set autocommit=0;
|
|
call innodb_insert_proc(1500);
|
|
commit;
|
|
set autocommit=1;
|
|
|
|
--echo # Wait max 10 min for key encryption threads to encrypt all spaces
|
|
--let $wait_timeout= 600
|
|
--let $wait_condition=SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0
|
|
--source include/wait_condition.inc
|
|
--let $MYSQLD_DATADIR=`select @@datadir`
|
|
|
|
--source include/shutdown_mysqld.inc
|
|
--source include/wait_until_disconnected.inc
|
|
|
|
--let SEARCH_RANGE = 10000000
|
|
--let SEARCH_PATTERN=foobar
|
|
--echo # t1 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t1.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=temp
|
|
--echo # t2 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t2.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=barfoo
|
|
--echo # t3 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t3.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=repeat
|
|
--echo # t4 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t4.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=author
|
|
--echo # t5 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t5.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=mangled
|
|
--echo # t6 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t6.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=mysql
|
|
--echo # t7 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t7.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
|
|
-- source include/start_mysqld.inc
|
|
|
|
--disable_warnings
|
|
SET GLOBAL innodb_file_format = `Barracuda`;
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
--enable_warnings
|
|
|
|
ALTER TABLE t1 ADD COLUMN b int default 2;
|
|
ALTER TABLE t2 ADD COLUMN b int default 2;
|
|
ALTER TABLE t7 ADD COLUMN b int default 2;
|
|
ALTER TABLE t1 ADD KEY a(a), ADD KEY b(b);
|
|
ALTER TABLE t2 ADD KEY a(a), ADD KEY b(b);
|
|
ALTER TABLE t3 ADD COLUMN c int default 5;
|
|
ALTER TABLE t4 ADD COLUMN c int default 5;
|
|
ALTER TABLE t3 ADD KEY (a), ADD KEY c(c);
|
|
ALTER TABLE t4 ADD KEY (a), ADD KEY c(c);
|
|
ALTER TABLE t5 ADD FULLTEXT(a);
|
|
ALTER TABLE t6 ADD FULLTEXT(a);
|
|
ALTER TABLE t7 ADD KEY a(a), ADD key b(b);
|
|
|
|
SHOW CREATE TABLE t1;
|
|
SHOW CREATE TABLE t2;
|
|
SHOW CREATE TABLE t3;
|
|
SHOW CREATE TABLE t4;
|
|
SHOW CREATE TABLE t5;
|
|
SHOW CREATE TABLE t6;
|
|
SHOW CREATE TABLE t7;
|
|
|
|
--source include/shutdown_mysqld.inc
|
|
--source include/wait_until_disconnected.inc
|
|
|
|
--let SEARCH_PATTERN=foobar
|
|
--echo # t1 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t1.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=temp
|
|
--echo # t2 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t2.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=barfoo
|
|
--echo # t3 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t3.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=repeat
|
|
--echo # t4 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t4.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=author
|
|
--echo # t5 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t5.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=mangled
|
|
--echo # t6 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t6.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
--let SEARCH_PATTERN=mysql
|
|
--echo # t7 ... on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$MYSQLD_DATADIR/test/t7.ibd
|
|
-- source include/search_pattern_in_file.inc
|
|
|
|
-- source include/start_mysqld.inc
|
|
|
|
DROP PROCEDURE innodb_insert_proc;
|
|
DROP TABLE t1, t2, t3, t4, t5, t6, t7;
|