# Features:
# * lock and write PID file /var/run/$name.pid to make sure onyl
# one instance is running.
+# * keep lock open during restart
# * correctly daemonize (redirect STDIN/STDOUT)
# * restart by stop/start, exec, or signal HUP
# * daemon restart on error (option 'restart_on_error')
# * handle worker processes (option 'max_workers')
-
+# * allow to restart while workers are still runningl
+# (option 'leave_children_open_on_reload')
+
use strict;
use warnings;
use PVE::SafeSyslog;
my $lkfn = $self->{pidfile} . ".lock";
+ my $waittime = 0;
+
if (my $fd = $self->{env_pve_lock_fd}) {
$self->{daemon_lock_fh} = IO::Handle->new_from_fd($fd, "a");
-
+
} else {
+ $waittime = 5;
$self->{daemon_lock_fh} = IO::File->new(">>$lkfn");
}
die "can't open lock '$lkfn' - $!\n";
}
- for (my $i = 0; $i < 5; $i ++) {
+ for (my $i = 0; $i < $waittime; $i ++) {
return if flock ($self->{daemon_lock_fh}, LOCK_EX|LOCK_NB);
sleep(1);
}
my $finish_workers = sub {
my ($self) = @_;
- foreach my $cpid (keys %{$self->{workers}}) {
- my $waitpid = waitpid($cpid, WNOHANG);
- if (defined($waitpid) && ($waitpid == $cpid)) {
- delete ($self->{workers}->{$cpid});
- syslog('info', "worker $cpid finished");
+ foreach my $id (qw(workers old_workers)) {
+ foreach my $cpid (keys %{$self->{$id}}) {
+ my $waitpid = waitpid($cpid, WNOHANG);
+ if (defined($waitpid) && ($waitpid == $cpid)) {
+ delete ($self->{$id}->{$cpid});
+ syslog('info', "worker $cpid finished");
+ }
}
}
};
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
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?
+ }
}
}
}
$SIG{HUP} = sub {
local ($@, $!, $?); # do not overwrite error vars
syslog('info', "received signal HUP");
+ $self->{got_hup_signal} = 1;
if ($self->{max_workers}) {
&$terminate_server($self);
- $self->{got_hup_signal} = 1;
} elsif ($self->can('hup')) {
eval { $self->hup() };
warn $@ if $@;
if ($err) {
syslog ('err', "ERROR: $err");
- # fixme: kill all workers
+ &$terminate_server($self);
if (my $wait_time = $self->{restart_on_error}) {
$self->restart_daemon($wait_time);
sub new {
my ($this, $name, $cmdline, %params) = @_;
- die "missing name" if !$name;
+ $name = 'daemon' if !$name; # should not happen
initlog($name);
- my $restart = $ENV{RESTART_PVE_DAEMON};
- delete $ENV{RESTART_PVE_DAEMON};
+ my $self;
- my $lockfd = $ENV{PVE_DAEMON_LOCK_FD};
- delete $ENV{PVE_DAEMON_LOCK_FD};
+ eval {
- die "please run as root\n" if !$restart && ($> != 0);
+ my $restart = $ENV{RESTART_PVE_DAEMON};
+ delete $ENV{RESTART_PVE_DAEMON};
- die "can't create more that one PVE::Daemon" if $daemon_initialized;
- $daemon_initialized = 1;
+ my $lockfd = $ENV{PVE_DAEMON_LOCK_FD};
+ delete $ENV{PVE_DAEMON_LOCK_FD};
- PVE::INotify::inotify_init();
+ if (defined($lockfd)) {
+ die "unable to parse lock fd '$lockfd'\n"
+ if $lockfd !~ m/^(\d+)$/;
+ $lockfd = $1; # untaint
+ }
- my $class = ref($this) || $this;
+ die "please run as root\n" if !$restart && ($> != 0);
- my $self = bless {
- name => $name,
- run_dir => '/var/run',
- env_restart_pve_daemon => $restart,
- env_pve_lock_fd => $lockfd,
- workers => {},
- }, $class;
+ die "can't create more that one PVE::Daemon" if $daemon_initialized;
+ $daemon_initialized = 1;
- foreach my $opt (keys %params) {
- my $value = $params{$opt};
- if ($opt eq 'restart_on_error') {
- $self->{$opt} = $value;
- } elsif ($opt eq 'stop_wait_time') {
- $self->{$opt} = $value;
- } elsif ($opt eq 'run_dir') {
- $self->{$opt} = $value;
- } elsif ($opt eq 'max_workers') {
- $self->{$opt} = $value;
- } else {
- die "unknown option '$opt'";
+ PVE::INotify::inotify_init();
+
+ my $class = ref($this) || $this;
+
+ $self = bless {
+ name => $name,
+ run_dir => '/var/run',
+ env_restart_pve_daemon => $restart,
+ env_pve_lock_fd => $lockfd,
+ workers => {},
+ old_workers => {},
+ }, $class;
+
+ foreach my $opt (keys %params) {
+ my $value = $params{$opt};
+ if ($opt eq 'restart_on_error') {
+ $self->{$opt} = $value;
+ } elsif ($opt eq 'stop_wait_time') {
+ $self->{$opt} = $value;
+ } elsif ($opt eq 'run_dir') {
+ $self->{$opt} = $value;
+ } elsif ($opt eq 'max_workers') {
+ $self->{$opt} = $value;
+ } elsif ($opt eq 'leave_children_open_on_reload') {
+ $self->{$opt} = $value;
+ } else {
+ die "unknown daemon option '$opt'\n";
+ }
+ }
+
+ if ($restart && $self->{max_workers}) {
+ if (my $wpids = $ENV{PVE_DAEMON_WORKER_PIDS}) {
+ foreach my $pid (split(':', $wpids)) {
+ if ($pid =~ m/^(\d+)$/) {
+ $self->{old_workers}->{$1} = 1;
+ }
+ }
+ }
}
- }
- $self->{pidfile} = "$self->{run_dir}/${name}.pid";
+ $self->{pidfile} = "$self->{run_dir}/${name}.pid";
- $self->{nodename} = PVE::INotify::nodename();
+ $self->{nodename} = PVE::INotify::nodename();
- $self->{cmdline} = [];
+ $self->{cmdline} = [];
- foreach my $el (@$cmdline) {
- $el =~ m/^(.*)$/; # untaint
- push @{$self->{cmdline}}, $1;
- }
+ foreach my $el (@$cmdline) {
+ $el =~ m/^(.*)$/; # untaint
+ push @{$self->{cmdline}}, $1;
+ }
- $0 = $name;
+ $0 = $name;
+ };
+ if (my $err = $@) {
+ &$log_err($err);
+ exit(-1);
+ }
return $self;
}
$ENV{RESTART_PVE_DAEMON} = 1;
+ if ($self->{max_workers}) {
+ my @workers = keys %{$self->{workers}};
+ push @workers, keys %{$self->{old_workers}};
+ $ENV{PVE_DAEMON_WORKER_PIDS} = join(':', @workers);
+ }
+
sleep($waittime) if $waittime; # avoid high server load due to restarts
PVE::INotify::inotify_close();
}
sub register_start_command {
- my ($self, $class, $description) = @_;
+ my ($self, $description) = @_;
+
+ my $class = ref($self);
$class->register_method({
name => 'start',
};
sub register_restart_command {
- my ($self, $class, $use_hup, $description) = @_;
+ my ($self, $use_hup, $description) = @_;
+
+ my $class = ref($self);
$class->register_method({
name => 'restart',
}
sub register_reload_command {
- my ($self, $class, $description) = @_;
+ my ($self, $description) = @_;
+
+ my $class = ref($self);
$class->register_method({
name => 'reload',
}
sub register_stop_command {
- my ($self, $class, $description) = @_;
+ my ($self, $description) = @_;
+
+ my $class = ref($self);
$class->register_method({
name => 'stop',
}
sub register_status_command {
- my ($self, $class, $description) = @_;
+ my ($self, $description) = @_;
+
+ my $class = ref($self);
$class->register_method({
name => 'status',
projects / pve-common.git / blobdiff