Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2024-12-26 07:21:26 +03:00
Code Releases Activity

Daemon: also terminate old_workers on stop

Browse Source
This commit is contained in:
Dietmar Maurer 2015-01-01 12:42:31 +01:00
parent 8826037040
commit f3a33995cd
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
data/PVE/Daemon.pm
View File

@ -191,24 +191,32 @@ my $terminate_server = sub {
eval { $self->shutdown(); };
warn $@ if $@;
# we have workers - terminate them
# we have workers - send TERM signal
foreach my $cpid (keys %{$self->{workers}}) {
kill(15, $cpid); # TERM childs
}
# if configured, leave children running on HUP
return if $self->{got_hup_signal} &&
$self->{leave_children_open_on_reload};
# else, send TERM to old workers
foreach my $cpid (keys %{$self->{old_workers}}) {
kill(15, $cpid); # TERM childs
}
# nicely shutdown childs (give them max 10 seconds to shut down)
my $previous_alarm = alarm(10);
eval {
local $SIG{ALRM} = sub { die "timeout\n" };
while ((my $pid = waitpid (-1, 0)) > 0) {
if (defined($self->{workers}->{$pid})) {
delete($self->{workers}->{$pid});
syslog('info', "worker $pid finished");
foreach my $id (qw(workers old_workers)) {
if (defined($self->{$id}->{$pid})) {
delete($self->{$id}->{$pid});
syslog('info', "worker $pid finished");
}
}
}
alarm(0); # avoid race condition
@ -219,13 +227,15 @@ my $terminate_server = sub {
if ($err) {
syslog('err', "error stopping workers (will kill them now) - $err");
foreach my $cpid (keys %{$self->{workers}}) {
# KILL childs still alive!
if (kill (0, $cpid)) {
delete($self->{workers}->{$cpid});
syslog("err", "kill worker $cpid");
kill(9, $cpid);
# fixme: waitpid?
foreach my $id (qw(workers old_workers)) {
foreach my $cpid (keys %{$self->{$id}}) {
# KILL childs still alive!
if (kill (0, $cpid)) {
delete($self->{$id}->{$cpid});
syslog("err", "kill worker $cpid");
kill(9, $cpid);
# fixme: waitpid?
}
}
}
}