1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid shutdown timeout in innodb.undo_truncate

Browse Source 
Let us explicitly wait for purge before invoking a slow shutdown,
so that instrumented builds (such as ASAN or UBSAN) will not
exceed the 60-second timeout during shutdown.
This commit is contained in:
Marko Mäkelä 2022-03-11 16:14:06 +02:00
parent 1766a18e06
commit dc680d2119
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/r/undo_truncate.result
View File

@ -31,5 +31,7 @@ connection con2;
commit; commit;
disconnect con2; disconnect con2;
connection default; connection default;
SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
SET GLOBAL innodb_max_purge_lag_wait=0;
set global innodb_fast_shutdown=0; set global innodb_fast_shutdown=0;
drop table t1, t2; drop table t1, t2;

2
mysql-test/suite/innodb/t/undo_truncate.test
View File

@ -45,6 +45,8 @@ connection default;
let $trx_before= `SHOW ENGINE INNODB STATUS`; let $trx_before= `SHOW ENGINE INNODB STATUS`;
let $trx_before= `select substr('$trx_before',9)+2`; let $trx_before= `select substr('$trx_before',9)+2`;
SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
SET GLOBAL innodb_max_purge_lag_wait=0;
set global innodb_fast_shutdown=0; set global innodb_fast_shutdown=0;
--source include/restart_mysqld.inc --source include/restart_mysqld.inc
--replace_regex /.*Trx id counter ([0-9]+).*/\1/ --replace_regex /.*Trx id counter ([0-9]+).*/\1/