Skip to content

Commit

Permalink
MDEV-19200: shutdown timeout on innodb.undo_truncate_recover
Browse files Browse the repository at this point in the history
Optimize the test by dropping the table early and by using only
one undo log thread, so that purge will be doing more useful work
and less busy work of suspending and resuming the worker threads.

The test used to cause shutdown timeout on 10.4 on buildbot, and
for me locally when using --mysqld=--innodb-sync-debug.
With these tweaks, it passes for me with --mysqld=--innodb-sync-debug.
  • Loading branch information
dr-m committed Aug 16, 2019
1 parent 555af00 commit fe6eac0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion mysql-test/suite/innodb/r/undo_truncate_recover.result
Expand Up @@ -9,8 +9,8 @@ update t1 set c = 'MariaDB';
update t1 set c = 'InnoDB';
set global debug_dbug = '+d,ib_undo_trunc';
commit;
drop table t1;
call mtr.add_suppression("InnoDB: innodb_undo_tablespaces=0 disables dedicated undo log tablespaces");
call mtr.add_suppression("InnoDB: The transaction log size is too large");
SET GLOBAL innodb_fast_shutdown=0;
FOUND 1 /ib_undo_trunc/ in mysqld.1.err
drop table t1;
1 change: 1 addition & 0 deletions mysql-test/suite/innodb/t/undo_truncate_recover.opt
@@ -0,0 +1 @@
--innodb-purge-threads=1
3 changes: 1 addition & 2 deletions mysql-test/suite/innodb/t/undo_truncate_recover.test
Expand Up @@ -34,6 +34,7 @@ update t1 set c = 'MariaDB';
update t1 set c = 'InnoDB';
eval set global debug_dbug = '+d,$SEARCH_PATTERN';
commit;
drop table t1;
call mtr.add_suppression("InnoDB: innodb_undo_tablespaces=0 disables dedicated undo log tablespaces");
# FIXME: remove this work-around, and generate less log!
call mtr.add_suppression("InnoDB: The transaction log size is too large");
Expand All @@ -43,5 +44,3 @@ SET GLOBAL innodb_fast_shutdown=0;
# FIXME: remove this work-around, and generate less log!
--let $restart_parameters= --innodb-buffer-pool-size=16m --innodb-undo-tablespaces=1
--source include/start_mysqld.inc

drop table t1;

0 comments on commit fe6eac0

Please sign in to comment.