MDEV-14814: encryption.innodb_encryption-page-compression failed in b…

…uildbot with timeout on wait condition Test changes only.
MariaDB · Feb 19, 2018 · 7a84688 · 7a84688
1 parent 9ea3ad6
commit 7a84688
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/mysql-test/suite/encryption/disabled.def b/mysql-test/suite/encryption/disabled.def
@@ -12,4 +12,4 @@
 
 innodb_scrub            : MDEV-8139 scrubbing does not work reliably
 innodb_scrub_background : MDEV-8139 scrubbing does not work reliably
-innodb_encryption-page-compression : MDEV-14814 encryption.innodb_encryption-page-compression failed in buildbot with timeout on wait condition
+
diff --git a/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result b/mysql-test/suite/encryption/r/innodb_encryption-page-compression.result
@@ -141,6 +141,7 @@ innodb_page_compressed5, innodb_page_compressed6,
 innodb_page_compressed7, innodb_page_compressed8,
 innodb_page_compressed9 for export;
 unlock tables;
+# Wait until dirty pages are compressed and encrypted
 SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
 variable_value > 0
 1
@@ -164,9 +165,8 @@ innodb_page_compressed5, innodb_page_compressed6,
 innodb_page_compressed7, innodb_page_compressed8,
 innodb_page_compressed9 for export;
 unlock tables;
-SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
-variable_value > 0
-1
+# 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
@@ -89,6 +89,7 @@ innodb_page_compressed9 for export;
 
 unlock tables;
 
+--echo # Wait until dirty pages are compressed and encrypted
 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
 let $wait_condition= select variable_value > 0 from information_schema.global_status where variable_name = 'INNODB_NUM_PAGES_ENCRYPTED';
@@ -117,12 +118,15 @@ 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
 
-SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
 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_page_compressed';
 SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_page_decompressed';