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

MDEV-7330 plugins.feedback_plugin_send fails sporadically in buildbot

Browse Source 
The test restarts the server and expects that the feedback plugin
will send a report on shutdown, and will write about it in the error
log. But the server is only given 10 sec to shut down properly,
which is not always enough.
Added a parameter to restart_mysqld.inc, and set it to a bigger
value in feedback_plugin_send
This commit is contained in:
Elena Stepanova
2015-09-27 18:01:47 +03:00
parent bdcf370765
commit ce7d8c5ee8
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/include/restart_mysqld.inc
View File

@ -1,3 +1,8 @@
# ==== Usage ====
#
# [--let $shutdown_timeout= 30]
# [--let $allow_rpl_inited= 1]
# --source include/restart_mysqld.inc
if ($rpl_inited)
{
@ -7,6 +12,16 @@ if ($rpl_inited)
}
}
--let $server_shutdown_timeout= 10
if ($shutdown_timeout)
{
--let $server_shutdown_timeout= $shutdown_timeout
}
if ($shutdown_timeout == 0)
{
--let $server_shutdown_timeout= 0
}
# Write file to make mysql-test-run.pl expect the "crash", but don't start
# it until it's told to
--let $_server_id= `SELECT @@server_id`
@ -15,7 +30,7 @@ if ($rpl_inited)
# Send shutdown to the connected server and give
# it 10 seconds to die before zapping it
shutdown_server 10;
shutdown_server $server_shutdown_timeout;
# Write file to make mysql-test-run.pl start up the server again
--exec echo "restart" > $_expect_file_name