Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds
This commit is contained in:
parent
dfbb36c58a
commit
4e5990481d
@ -359,7 +359,7 @@ sub mtr_kill_leftovers () {
|
|||||||
"socket: '$srv->{path_sock}'; ".
|
"socket: '$srv->{path_sock}'; ".
|
||||||
"port: $srv->{port})");
|
"port: $srv->{port})");
|
||||||
|
|
||||||
my $pid= mtr_mysqladmin_start($srv, "shutdown", 70);
|
my $pid= mtr_mysqladmin_start($srv, "shutdown", 20);
|
||||||
|
|
||||||
# Save the pid of the mysqladmin process
|
# Save the pid of the mysqladmin process
|
||||||
$admin_pids{$pid}= 1;
|
$admin_pids{$pid}= 1;
|
||||||
|
@ -4328,7 +4328,7 @@ sub run_testcase_stop_servers($$$) {
|
|||||||
{
|
{
|
||||||
if ( $mysqld->{'pid'} )
|
if ( $mysqld->{'pid'} )
|
||||||
{
|
{
|
||||||
$pid= mtr_mysqladmin_start($mysqld, "shutdown", 70);
|
$pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
|
||||||
|
|
||||||
$admin_pids{$pid}= 1;
|
$admin_pids{$pid}= 1;
|
||||||
|
|
||||||
@ -4380,7 +4380,7 @@ sub run_testcase_stop_servers($$$) {
|
|||||||
{
|
{
|
||||||
if ( $mysqld->{'pid'} )
|
if ( $mysqld->{'pid'} )
|
||||||
{
|
{
|
||||||
$pid= mtr_mysqladmin_start($mysqld, "shutdown", 70);
|
$pid= mtr_mysqladmin_start($mysqld, "shutdown", 20);
|
||||||
|
|
||||||
$admin_pids{$pid}= 1;
|
$admin_pids{$pid}= 1;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user