diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2020-08-20 15:32:35 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2020-08-21 14:48:53 +0300 |
| commit | a19cb3884f443e68eecfa7b96ea109768a0a6188 (patch) | |
| tree | 25f868a7969f50c6e57e48156cff776c59c8e89a /mysql-test/suite/storage_engine | |
| parent | a43faf6b165b78cda9be8d1d11afb7aa2681c4ed (diff) | |
| download | mariadb-git-a19cb3884f443e68eecfa7b96ea109768a0a6188.tar.gz | |
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.
Diffstat (limited to 'mysql-test/suite/storage_engine')
| -rw-r--r-- | mysql-test/suite/storage_engine/alter_tablespace.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/storage_engine/trx/xa_recovery.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test index 3c4910069a0..1899da28320 100644 --- a/mysql-test/suite/storage_engine/alter_tablespace.test +++ b/mysql-test/suite/storage_engine/alter_tablespace.test @@ -46,7 +46,7 @@ wait EOF --enable_reconnect - --shutdown_server 60 + --shutdown_server --source include/wait_until_disconnected.inc diff --git a/mysql-test/suite/storage_engine/trx/xa_recovery.test b/mysql-test/suite/storage_engine/trx/xa_recovery.test index e17bb9d2ea4..f53640578cd 100644 --- a/mysql-test/suite/storage_engine/trx/xa_recovery.test +++ b/mysql-test/suite/storage_engine/trx/xa_recovery.test @@ -12,7 +12,7 @@ --append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect restart EOF ---shutdown_server 60 +--shutdown_server --source include/wait_until_connected_again.inc |