mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-23511 shutdown_server 10 times out, causing server kill at shutdown
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:
@ -47,8 +47,8 @@ if ($rpl_debug)
|
||||
--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
|
||||
|
||||
# Send shutdown to the connected server and give
|
||||
# it 60 seconds to die before zapping it
|
||||
shutdown_server 60;
|
||||
# it 60 seconds (of mysqltest's default) to die before zapping it
|
||||
shutdown_server;
|
||||
|
||||
--source include/wait_until_disconnected.inc
|
||||
|
||||
|
Reference in New Issue
Block a user