percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-21 19:34:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use TERM instead of QUIT signal so pt-agent can trap it.

Browse Source
This commit is contained in:
Daniel Nichter
2013-04-09 18:20:44 -06:00
parent 279b8f2188
commit c246bf12f3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-agent
View File

@@ -6411,7 +6411,7 @@ sub stop_agent {
} }
else { else {
_info("Stopping pt-agent..."); _info("Stopping pt-agent...");
kill 3, $pid; kill 15, $pid;
for (1..5) { for (1..5) {
$alive = kill 0, $pid; $alive = kill 0, $pid;
last unless $alive; last unless $alive;
@@ -6419,7 +6419,7 @@ sub stop_agent {
} }
$alive = kill 0, $pid; $alive = kill 0, $pid;
if ( $alive ) { if ( $alive ) {
_warn("pt-agent did not respond to the QUIT signal, using " _warn("pt-agent did not respond to the TERM signal, using "
. "the KILL signal..."); . "the KILL signal...");
kill 9, $pid; kill 9, $pid;
for (1..3) { for (1..3) {
@@ -6457,7 +6457,7 @@ sub stop_agent {
_info("Disabling all services (clean up)..."); _info("Disabling all services (clean up)...");
SERVICE: SERVICE:
foreach my $service ( glob "$lib_dir/services/disable-*" ) { foreach my $service ( glob "$lib_dir/services/disable-*" ) {
my $disable_log = "$lib_dir/logs/" . $service->name . ".stop"; my $disable_log = "$lib_dir/logs/$service.stop";
my $cmd = ($env_vars ? "$env_vars " : '') my $cmd = ($env_vars ? "$env_vars " : '')
. "${bin_dir}pt-agent --run-service $service" . "${bin_dir}pt-agent --run-service $service"
. " </dev/null" . " </dev/null"