1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

my_safe_process: try to kill the process softly first

Browse Source 
first SIGTERM and if the process didn't die in 10 seconds, SIGKILL it.

This allows various tools like `rr`, `gcov`, `gprof`, etc to flush
their data to disk properly
This commit is contained in:
Sergei Golubchik 2022-06-23 12:59:31 +02:00
parent 9ecdf860ce
commit 122742897b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/lib/My/SafeProcess/safe_process.cc
View File

@ -140,13 +140,20 @@ void handle_core(pid_t pid __attribute__((unused))) {}
static int kill_child(bool was_killed) static int kill_child(bool was_killed)
{ {
int status= 0; int status= 0;
pid_t ret_pid= 0;
message("Killing child: %d", child_pid); message("Killing child: %d", child_pid);
// Terminate whole process group // Terminate whole process group
if (! was_killed) if (! was_killed)
kill(-child_pid, SIGKILL); {
kill(-child_pid, SIGTERM);
sleep(10); // will be interrupted by SIGCHLD
if (!(ret_pid= waitpid(child_pid, &status, WNOHANG)))
kill(-child_pid, SIGKILL);
}
pid_t ret_pid= waitpid(child_pid, &status, 0); if (!ret_pid)
ret_pid= waitpid(child_pid, &status, 0);
if (ret_pid == child_pid) if (ret_pid == child_pid)
{ {
int exit_code= 1; int exit_code= 1;