mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki 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
commit a19cb3884f
32 changed files with 52 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_rate_limiter_bytes_per_sec_basic.test
View file

@ -13,7 +13,7 @@ SET @@global.rocksdb_rate_limiter_bytes_per_sec = 10000;
# Send shutdown to the connected server and give it 10 seconds to die before
# zapping it
shutdown_server 10;
shutdown_server;
# Attempt to restart the server with the rate limiter on
--exec echo "restart:--rocksdb_rate_limiter_bytes_per_sec=10000" >$_expect_file_name
@ -53,7 +53,7 @@ SET @@global.rocksdb_rate_limiter_bytes_per_sec = -1;
# Restart the server without the rate limiter
--exec echo "wait" >$_expect_file_name
shutdown_server 10;
shutdown_server;
--exec echo "restart" >$_expect_file_name
--sleep 5