diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-24 18:03:41 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-24 22:39:21 +0200 |
| commit | e826d1e64d4c03f2365763f64c180b67ed95bb53 (patch) | |
| tree | 70a203784e37b23c8a823b45a1520c750a9e8423 | |
| parent | e92cc097658405fdb52c80254b933424f8c1f99e (diff) | |
| download | mariadb-git-e826d1e64d4c03f2365763f64c180b67ed95bb53.tar.gz | |
MDEV-14814: encryption.innodb_encryption-page-compression failed in buildbot with timeout on wait condition
Fix wrong wait condition.
3 files changed, 15 insertions, 5 deletions
diff --git a/mysql-test/suite/encryption/disabled.def b/mysql-test/suite/encryption/disabled.def index 08f8bd8542b..9777a4ac99a 100644 --- a/mysql-test/suite/encryption/disabled.def +++ b/mysql-test/suite/encryption/disabled.def @@ -13,4 +13,4 @@ innodb_scrub : 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_encryption-page-compression : MDEV-14814 wait condition timeout + diff --git a/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result b/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result index 712690d2925..34eb9b0c6dd 100644 --- a/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result +++ b/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result @@ -1,5 +1,4 @@ SET GLOBAL innodb_encryption_threads = 4; -SET GLOBAL innodb_encrypt_tables = on; set global innodb_compression_algorithm = 1; create table innodb_normal (c1 int, b char(20)) engine=innodb; show warnings; @@ -165,7 +164,6 @@ innodb_page_compressed7, innodb_page_compressed8, innodb_page_compressed9 for export; unlock tables; # 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'; variable_value > 0 1 diff --git a/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test b/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test index 4f8a3373fb2..bd14def69f9 100644 --- a/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test +++ b/mysql-test/suite/encryption/t/innodb_encryption-page-compression.test @@ -2,8 +2,14 @@ -- source include/have_example_key_management_plugin.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_encrypt_tables = on; +--enable_warnings # zlib set global innodb_compression_algorithm = 1; @@ -110,12 +116,12 @@ innodb_page_compressed3, innodb_page_compressed4, innodb_page_compressed5, innodb_page_compressed6, innodb_page_compressed7, innodb_page_compressed8, innodb_page_compressed9 for export; + unlock tables; --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'; --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'; --source include/wait_condition.inc @@ -134,3 +140,9 @@ drop table innodb_page_compressed6; drop table innodb_page_compressed7; drop table innodb_page_compressed8; 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 |