database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-23511 shutdown_server 10 times out, causing server kill at shutdown

Browse Source 
Shutdown of mtr tests may be too impatient, esp on CI environment where
10 seconds of `arg` of `shutdown_server arg` may not be enough for the clean
shutdown to complete.

This is fixed to remove explicit non-zero timeout argument to
`shutdown_server` from all mtr tests. mysqltest computes 60 seconds default
value for the timeout for the argless `shutdown_server` command.
This policy is additionally ensured with a compile time assert.
This commit is contained in:
Andrei Elkin
2020-08-20 15:32:35 +03:00
parent a43faf6b16
commit a19cb3884f
32 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/encryption/t/innochecksum.test
View File

@ -63,7 +63,7 @@ let MYSQLD_DATADIR=`select @@datadir`;
--echo # We give 30 seconds to do a clean shutdown because we do not want
--echo # to redo apply the pages of t1.ibd at the time of recovery.
--echo # We want SQL to initiate the first access to t1.ibd.
shutdown_server 30;
shutdown_server;
--echo # Wait until disconnected.
--source include/wait_until_disconnected.inc