mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
eca238aea7
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.
109 lines
6.1 KiB
Text
109 lines
6.1 KiB
Text
-- source include/have_innodb.inc
|
|
-- source include/have_file_key_management_plugin.inc
|
|
-- source include/not_embedded.inc
|
|
|
|
--disable_warnings
|
|
SET GLOBAL innodb_file_format = `Barracuda`;
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
--enable_warnings
|
|
|
|
FLUSH STATUS;
|
|
|
|
create database innodb_test;
|
|
use innodb_test;
|
|
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
|
|
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact;
|
|
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic;
|
|
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed;
|
|
create table innodb_compressed1(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=1;
|
|
create table innodb_compressed2(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=2;
|
|
create table innodb_compressed4(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=4;
|
|
create table innodb_compressed8(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=8;
|
|
create table innodb_compressed16(c1 bigint not null, b char(200)) engine=innodb row_format=compressed key_block_size=16;
|
|
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant;
|
|
create table innodb_pagecomp(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes;
|
|
create table innodb_pagecomp1(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=1;
|
|
create table innodb_pagecomp2(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=2;
|
|
create table innodb_pagecomp3(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=3;
|
|
create table innodb_pagecomp4(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=4;
|
|
create table innodb_pagecomp5(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=5;
|
|
create table innodb_pagecomp6(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=6;
|
|
create table innodb_pagecomp7(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=7;
|
|
create table innodb_pagecomp8(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=8;
|
|
create table innodb_pagecomp9(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes page_compression_level=9;
|
|
|
|
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
|
|
eval create table innodb_datadir1(c1 bigint not null, b char(200)) engine=innodb DATA DIRECTORY='$MYSQL_TMP_DIR';
|
|
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
|
|
eval create table innodb_datadir2(c1 bigint not null, b char(200)) engine=innodb row_format=compressed DATA DIRECTORY='$MYSQL_TMP_DIR';
|
|
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
|
|
eval create table innodb_datadir3(c1 bigint not null, b char(200)) engine=innodb page_compressed=yes DATA DIRECTORY='$MYSQL_TMP_DIR';
|
|
|
|
begin;
|
|
insert into innodb_normal values (1,'secret');
|
|
insert into innodb_compact select * from innodb_normal;
|
|
insert into innodb_dynamic select * from innodb_normal;
|
|
insert into innodb_compressed select * from innodb_normal;
|
|
insert into innodb_compressed1 select * from innodb_normal;
|
|
insert into innodb_compressed2 select * from innodb_normal;
|
|
insert into innodb_compressed4 select * from innodb_normal;
|
|
insert into innodb_compressed8 select * from innodb_normal;
|
|
insert into innodb_compressed16 select * from innodb_normal;
|
|
insert into innodb_redundant select * from innodb_normal;
|
|
insert into innodb_pagecomp select * from innodb_normal;
|
|
insert into innodb_pagecomp1 select * from innodb_normal;
|
|
insert into innodb_pagecomp2 select * from innodb_normal;
|
|
insert into innodb_pagecomp3 select * from innodb_normal;
|
|
insert into innodb_pagecomp4 select * from innodb_normal;
|
|
insert into innodb_pagecomp5 select * from innodb_normal;
|
|
insert into innodb_pagecomp6 select * from innodb_normal;
|
|
insert into innodb_pagecomp7 select * from innodb_normal;
|
|
insert into innodb_pagecomp8 select * from innodb_normal;
|
|
insert into innodb_pagecomp9 select * from innodb_normal;
|
|
insert into innodb_datadir1 select * from innodb_normal;
|
|
insert into innodb_datadir2 select * from innodb_normal;
|
|
insert into innodb_datadir3 select * from innodb_normal;
|
|
commit;
|
|
|
|
FLUSH STATUS;
|
|
|
|
--echo # Restart server and see how many page 0's are read
|
|
--source include/restart_mysqld.inc
|
|
|
|
--echo # result should actual number of tables except remote tables could be read twice
|
|
--echo # i.e. < 23 + 3*2 = 29
|
|
|
|
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';
|
|
use innodb_test;
|
|
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';
|
|
use test;
|
|
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';
|
|
|
|
set global innodb_encrypt_tables=OFF;
|
|
|
|
--echo # wait until tables are decrypted
|
|
--let $wait_condition=SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0
|
|
--source include/wait_condition.inc
|
|
|
|
--echo # result should be actual number of tables except remote tables could be read twice
|
|
--echo # i.e. < 23 + 3*2 = 29
|
|
|
|
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';
|
|
use innodb_test;
|
|
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';
|
|
use test;
|
|
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';
|
|
|
|
FLUSH STATUS;
|
|
|
|
--echo # restart and see number read page 0
|
|
-- source include/restart_mysqld.inc
|
|
|
|
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';
|
|
use innodb_test;
|
|
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';
|
|
use test;
|
|
SELECT VARIABLE_VALUE <= 29 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'innodb_pages0_read';
|
|
|
|
drop database innodb_test;
|
|
FLUSH STATUS;
|