Commit d6651864 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-28976: mtr must wait for server to actually die

do_shutdown_server(): Call wait_until_dead() also when we are forcibly
killing the process (timeout=0). We have evidence that killing
the process may take some time and cause mystery failures in
crash recovery tests. For InnoDB, several failures were observed between
commit da094188 and
commit 0ee1082b
when no advisory file locking was being used by default.
parent feeeacc4
......@@ -5191,7 +5191,7 @@ void do_shutdown_server(struct st_command *command)
if (timeout)
(void) my_kill(pid, SIGABRT);
/* Give server a few seconds to die in all cases */
if (!timeout || wait_until_dead(pid, timeout < 5 ? 5 : timeout))
if (wait_until_dead(pid, timeout < 5 ? 5 : timeout))
{
(void) my_kill(pid, SIGKILL);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment