database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-14814: encryption.innodb_encryption-page-compression failed in buildbot with timeout on wait condition

Browse Source 
Fix wrong wait condition.
This commit is contained in:
Jan Lindström
2018-02-24 18:03:41 +02:00
parent e92cc09765
commit e826d1e64d
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/encryption/disabled.def
View File

@ -13,4 +13,4 @@
innodb_scrub : MDEV-8139 scrubbing does not work reliably innodb_scrub : MDEV-8139 scrubbing does not work reliably
innodb_scrub_background : MDEV-8139 scrubbing does not work reliably innodb_scrub_background : MDEV-8139 scrubbing does not work reliably
innodb-redo-badkey : MDEV-13893 / MDEV-12699 Improve crash recovery of corrupted data pages innodb-redo-badkey : MDEV-13893 / MDEV-12699 Improve crash recovery of corrupted data pages
innodb_encryption-page-compression : MDEV-14814 wait condition timeout

2
mysql-test/suite/encryption/r/innodb_encryption-page-compression.result
View File

@ -1,5 +1,4 @@
SET GLOBAL innodb_encryption_threads = 4; SET GLOBAL innodb_encryption_threads = 4;
SET GLOBAL innodb_encrypt_tables = on;
set global innodb_compression_algorithm = 1; set global innodb_compression_algorithm = 1;
create table innodb_normal (c1 int, b char(20)) engine=innodb; create table innodb_normal (c1 int, b char(20)) engine=innodb;
show warnings; show warnings;
@ -165,7 +164,6 @@ innodb_page_compressed7, innodb_page_compressed8,
innodb_page_compressed9 for export; innodb_page_compressed9 for export;
unlock tables; unlock tables;
# Wait until dirty pages are compressed and encrypted 2 # Wait until dirty pages are compressed and encrypted 2
unlock tables;
SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted'; SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
variable_value > 0 variable_value > 0
1 1

16
mysql-test/suite/encryption/t/innodb_encryption-page-compression.test
View File

@ -2,8 +2,14 @@
-- source include/have_example_key_management_plugin.inc -- source include/have_example_key_management_plugin.inc
-- source include/not_embedded.inc -- source include/not_embedded.inc
--disable_query_log
let $innodb_encrypt_tables_orig = `SELECT @@innodb_encrypt_tables`;
let $innodb_encryption_threads_orig = `SELECT @@innodb_encryption_threads`;
--enable_query_log
--disable_warnings
SET GLOBAL innodb_encryption_threads = 4; SET GLOBAL innodb_encryption_threads = 4;
SET GLOBAL innodb_encrypt_tables = on; --enable_warnings
# zlib # zlib
set global innodb_compression_algorithm = 1; set global innodb_compression_algorithm = 1;
@ -110,12 +116,12 @@ innodb_page_compressed3, innodb_page_compressed4,
innodb_page_compressed5, innodb_page_compressed6, innodb_page_compressed5, innodb_page_compressed6,
innodb_page_compressed7, innodb_page_compressed8, innodb_page_compressed7, innodb_page_compressed8,
innodb_page_compressed9 for export; innodb_page_compressed9 for export;
unlock tables; unlock tables;
--echo # Wait until dirty pages are compressed and encrypted 2 --echo # Wait until dirty pages are compressed and encrypted 2
let $wait_condition= select variable_value > 0 from information_schema.global_status where variable_name = 'INNODB_NUM_PAGES_PAGE_COMPRESSED'; let $wait_condition= select variable_value > 0 from information_schema.global_status where variable_name = 'INNODB_NUM_PAGES_PAGE_COMPRESSED';
--source include/wait_condition.inc --source include/wait_condition.inc
unlock tables;
let $wait_condition= select variable_value > 0 from information_schema.global_status where variable_name = 'INNODB_NUM_PAGES_DECRYPTED'; let $wait_condition= select variable_value > 0 from information_schema.global_status where variable_name = 'INNODB_NUM_PAGES_DECRYPTED';
--source include/wait_condition.inc --source include/wait_condition.inc
@ -134,3 +140,9 @@ drop table innodb_page_compressed6;
drop table innodb_page_compressed7; drop table innodb_page_compressed7;
drop table innodb_page_compressed8; drop table innodb_page_compressed8;
drop table innodb_page_compressed9; drop table innodb_page_compressed9;
# reset system
--disable_query_log
EVAL SET GLOBAL innodb_encrypt_tables = $innodb_encrypt_tables_orig;
EVAL SET GLOBAL innodb_encryption_threads = $innodb_encryption_threads_orig;
--enable_query_log