mirror of
https://github.com/MariaDB/server.git
synced 2025-08-23 03:54:27 +03:00
This only merges MDEV-12253, adapting it to MDEV-12602 which is already present in 10.2 but not yet in the 10.1 revision that is being merged. TODO: Error handling in crash recovery needs to be improved. If a page cannot be decrypted (or read), we should cleanly abort the startup. If innodb_force_recovery is specified, we should ignore the problematic page and apply redo log to other pages. Currently, the test encryption.innodb-redo-badkey randomly fails like this (the last messages are from cmake -DWITH_ASAN): 2017-05-05 10:19:40 140037071685504 [Note] InnoDB: Starting crash recovery from checkpoint LSN=1635994 2017-05-05 10:19:40 140037071685504 [ERROR] InnoDB: Missing MLOG_FILE_NAME or MLOG_FILE_DELETE before MLOG_CHECKPOINT for tablespace 1 2017-05-05 10:19:40 140037071685504 [ERROR] InnoDB: Plugin initialization aborted at srv0start.cc[2201] with error Data structure corruption 2017-05-05 10:19:41 140037071685504 [Note] InnoDB: Starting shutdown... i================================================================= ==5226==ERROR: AddressSanitizer: attempting free on address which was not malloc()-ed: 0x612000018588 in thread T0 #0 0x736750 in operator delete(void*) (/mariadb/server/build/sql/mysqld+0x736750) #1 0x1e4833f in LatchCounter::~LatchCounter() /mariadb/server/storage/innobase/include/sync0types.h:599:4 #2 0x1e480b8 in LatchMeta<LatchCounter>::~LatchMeta() /mariadb/server/storage/innobase/include/sync0types.h:786:17 #3 0x1e35509 in sync_latch_meta_destroy() /mariadb/server/storage/innobase/sync/sync0debug.cc:1622:3 #4 0x1e35314 in sync_check_close() /mariadb/server/storage/innobase/sync/sync0debug.cc:1839:2 #5 0x1dfdc18 in innodb_shutdown() /mariadb/server/storage/innobase/srv/srv0start.cc:2888:2 #6 0x197e5e6 in innobase_init(void*) /mariadb/server/storage/innobase/handler/ha_innodb.cc:4475:3
72 lines
2.4 KiB
Plaintext
72 lines
2.4 KiB
Plaintext
call mtr.add_suppression("trying to do an operation on a dropped tablespace .*");
|
|
SET GLOBAL innodb_file_format = `Barracuda`;
|
|
Warnings:
|
|
Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
SET GLOBAL innodb_encrypt_tables = OFF;
|
|
SET GLOBAL innodb_encryption_threads = 4;
|
|
CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB;
|
|
SHOW CREATE TABLE t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`pk` int(11) NOT NULL AUTO_INCREMENT,
|
|
`c` varchar(256) DEFAULT NULL,
|
|
PRIMARY KEY (`pk`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
CREATE TABLE t2 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB ENCRYPTED=YES;
|
|
CREATE TABLE t3 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB ENCRYPTED=NO;
|
|
CREATE TABLE t4 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
|
|
INSERT INTO t2 select * from t1;
|
|
INSERT INTO t3 select * from t1;
|
|
INSERT INTO t4 select * from t1;
|
|
SET GLOBAL innodb_encrypt_tables = on;
|
|
# Wait max 10 min for key encryption threads to encrypt required all spaces
|
|
# Success!
|
|
SELECT COUNT(1) FROM t1;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t2;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t3;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t4;
|
|
COUNT(1)
|
|
400
|
|
SET GLOBAL innodb_encrypt_tables = off;
|
|
# Wait max 10 min for key encryption threads to decrypt all required spaces
|
|
# Success!
|
|
SET GLOBAL innodb_encrypt_tables = ON;
|
|
set GLOBAL innodb_default_encryption_key_id=4;
|
|
CREATE TABLE t5 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB;
|
|
SHOW CREATE TABLE t5;
|
|
Table Create Table
|
|
t5 CREATE TABLE `t5` (
|
|
`pk` int(11) NOT NULL AUTO_INCREMENT,
|
|
`c` varchar(256) DEFAULT NULL,
|
|
PRIMARY KEY (`pk`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
INSERT INTO t5 select * from t1;
|
|
# Wait max 10 min for key encryption threads to encrypt required all spaces
|
|
# Success!
|
|
SELECT COUNT(1) FROM t1;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t2;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t3;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t4;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t5;
|
|
COUNT(1)
|
|
400
|
|
Warnings:
|
|
Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
|
|
drop table t1,t2,t3,t4, t5;
|
|
set GLOBAL innodb_default_encryption_key_id=1;
|