MDEV-23974 Tests fail due to [Warning] InnoDB: Trying to delete table…

…space A few regression tests invoke heavy flushing of the buffer pool and may trigger warnings that tablespaces could not be deleted because of pending writes. Those warnings are to be expected during the execution of such tests. The warnings are also frequently seen with Valgrind or MemorySanitizer. For those, the global suppression in have_innodb.inc does the trick.
MariaDB · Mar 23, 2022 · 75b7cd6 · 75b7cd6
1 parent 44231dc
commit 75b7cd6
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 1 deletion.
diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc
@@ -2,3 +2,13 @@
 # suite.pm will make sure that all tests including this file
 # will be skipped unless innodb is enabled
 #
+--disable_query_log
+if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
+{
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+}
+if ($VALGRIND_TEST)
+{
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+}
+--enable_query_log
diff --git a/mysql-test/main/flush_block_commit_notembedded.test b/mysql-test/main/flush_block_commit_notembedded.test
@@ -12,6 +12,10 @@
 --echo # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
 
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);

diff --git a/mysql-test/suite/encryption/t/innochecksum.test b/mysql-test/suite/encryption/t/innochecksum.test
@@ -15,6 +15,11 @@ if (!$INNOCHECKSUM) {
   --die Need innochecksum binary
 }
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 let $checksum_algorithm = `SELECT @@innodb_checksum_algorithm`;
 SET GLOBAL innodb_file_per_table = ON;
 # zlib

diff --git a/mysql-test/suite/innodb/include/innodb-page-compression.inc b/mysql-test/suite/innodb/include/innodb-page-compression.inc
@@ -1,5 +1,9 @@
 # This test is slow on buildbot.
 --source include/big_test.inc
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
 create table innodb_normal (c1 int not null auto_increment primary key, b char(200)) engine=innodb;
 create table innodb_page_compressed1 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=1;
 create table innodb_page_compressed2 (c1 int not null auto_increment primary key, b char(200)) engine=innodb page_compressed=1 page_compression_level=2;

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_bzip2.test b/mysql-test/suite/innodb/t/innodb-page_compression_bzip2.test
@@ -2,6 +2,11 @@
 -- source include/have_innodb_bzip2.inc
 -- source include/not_embedded.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # bzip2
 set global innodb_compression_algorithm = 5;
 

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_lz4.test b/mysql-test/suite/innodb/t/innodb-page_compression_lz4.test
@@ -4,6 +4,11 @@
 # The test can take very long time with valgrind
 --source include/not_valgrind.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # lz4
 set global innodb_compression_algorithm = 2;
 

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_lzma.test b/mysql-test/suite/innodb/t/innodb-page_compression_lzma.test
@@ -2,6 +2,11 @@
 -- source include/have_innodb_lzma.inc
 -- source include/not_embedded.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # lzma
 set global innodb_compression_algorithm = 4;
 

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_lzo.test b/mysql-test/suite/innodb/t/innodb-page_compression_lzo.test
@@ -2,6 +2,11 @@
 -- source include/have_innodb_lzo.inc
 -- source include/not_embedded.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # lzo
 set global innodb_compression_algorithm = 3;
 

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_tables.test b/mysql-test/suite/innodb/t/innodb-page_compression_tables.test
@@ -2,6 +2,10 @@
 --source include/not_embedded.inc
 
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
 
 # zlib
 set global innodb_compression_algorithm = 1;

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_zip.test b/mysql-test/suite/innodb/t/innodb-page_compression_zip.test
@@ -3,6 +3,11 @@
 # This test is slow on buildbot.
 --source include/big_test.inc
 
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
 # zlib
 set global innodb_compression_algorithm = 1;
 

diff --git a/mysql-test/suite/innodb/t/undo_truncate.test b/mysql-test/suite/innodb/t/undo_truncate.test
@@ -6,6 +6,9 @@
 
 --disable_query_log
 call mtr.add_suppression("InnoDB: Difficult to find free blocks in the buffer pool");
+--disable_query_log
+# This may be triggered on a slow system.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
 --enable_query_log
 
 SET GLOBAL innodb_undo_log_truncate = 0;

diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result
@@ -4,6 +4,11 @@ SELECT @orig;
 25
 SET GLOBAL innodb_buffer_pool_dump_pct=3;
 # Do the dump
+SELECT @@global.innodb_buffer_pool_dump_now;
+SELECT variable_value INTO @old_dump_status FROM information_schema.global_status
+WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
+SET GLOBAL innodb_buffer_pool_dump_now = ON;
+SELECT @@global.innodb_buffer_pool_dump_now;
 SET GLOBAL innodb_buffer_pool_dump_pct=20;
 SELECT @@global.innodb_buffer_pool_dump_pct;
 @@global.innodb_buffer_pool_dump_pct

diff --git a/mysql-test/suite/versioning/common.inc b/mysql-test/suite/versioning/common.inc
@@ -1,9 +1,9 @@
---disable_query_log
 if (!$TEST_VERSIONING_SO)
 {
   --skip needs test_versioning plugin
 }
 source include/have_innodb.inc;
+--disable_query_log
 
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from mysql.transaction_registry;