X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FDaemon.pm;h=d438d27012effdc546c839b927eeeefee116818d;hp=e051500431bf5a62c0817a3bbba0ea5c9af04fed;hb=d0138dbaca6d745420693552e86683a2d001ac2a;hpb=8e3e9929ac4e4bd7efcfd4d1b112b40adb43f48c

diff --git a/src/PVE/Daemon.pm b/src/PVE/Daemon.pm
index e051500..d438d27 100644
--- a/src/PVE/Daemon.pm
+++ b/src/PVE/Daemon.pm
@@ -34,6 +34,7 @@ use base qw(PVE::CLIHandler);
 $ENV{'PATH'} = '/sbin:/bin:/usr/sbin:/usr/bin';
 
 my $daemon_initialized = 0; # we only allow one instance
+my $daemon_sockets = [];
 
 my $close_daemon_lock = sub {
     my ($self) = @_;
@@ -183,6 +184,13 @@ my $start_workers = sub {
     }
 };
 
+my $terminate_old_workers = sub {
+    my ($self) = @_;
+
+    # if list is empty kill sends no signal, so no checks needed
+    kill 15, keys %{$self->{old_workers}};
+};
+
 my $terminate_server = sub {
     my ($self, $allow_open_children) = @_;
 
@@ -197,20 +205,12 @@ my $terminate_server = sub {
     eval { $self->shutdown(); };
     warn $@ if $@;
 
-    # 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 $allow_open_children &&
-	$self->{leave_children_open_on_reload};
+    return if $allow_open_children && $self->{leave_children_open_on_reload};
 
-    # else, send TERM to old workers
-    foreach my $cpid (keys %{$self->{old_workers}}) {
-	kill(15, $cpid); # TERM childs
-    }
+    # else send TERM to all (old and current) child workers
+    kill 15, keys %{$self->@{'workers','old_workers'}};
 
     # nicely shutdown childs (give them max 10 seconds to shut down)
     my $previous_alarm = alarm(10);
@@ -394,13 +394,11 @@ my $server_run = sub {
 		&$old_sig_chld(@_) if $old_sig_chld;
 	    };
 
-	    # catch worker finished during restart phase 
-	    &$finish_workers($self);
-
 	    # now loop forever (until we receive terminate signal)
 	    for (;;) { 
 		&$start_workers($self);
 		sleep(5);
+		&$terminate_old_workers($self);
 		&$finish_workers($self);
 		last if $self->{terminate};
 	    }
@@ -500,6 +498,10 @@ sub restart_daemon {
 
     $ENV{RESTART_PVE_DAEMON} = 1;
 
+    foreach my $ds (@$daemon_sockets) {
+	$ds->fcntl(Fcntl::F_SETFD(), 0);
+    }
+
     if ($self->{max_workers}) {
 	my @workers = keys %{$self->{workers}};
 	push @workers, keys %{$self->{old_workers}};
@@ -578,6 +580,16 @@ my $read_pid = sub {
     return $pid;
 };
 
+# checks if the process was started by systemd
+my $init_ppid = sub {
+
+    if (getppid() == 1) {
+       return 1;
+    } else {
+       return 0;
+    }
+}; 
+
 sub running {
     my ($self) = @_;
 
@@ -654,7 +666,11 @@ sub register_start_command {
 	code => sub {
 	    my ($param) = @_;
 
-	    $self->start($param->{debug});
+            if (&$init_ppid() || $param->{debug}) {
+                $self->start($param->{debug});
+            } else {
+                PVE::Tools::run_command(['systemctl', 'start', $self->{name}]);
+            }
 
 	    return undef;
 	}});  
@@ -700,7 +716,11 @@ sub register_restart_command {
 	code => sub {
 	    my ($param) = @_;
 
-	    &$reload_daemon($self, $use_hup);
+	    if (&$init_ppid()) {
+		&$reload_daemon($self, $use_hup);
+	    } else {
+		PVE::Tools::run_command(['systemctl', $use_hup ? 'reload-or-restart' : 'restart', $self->{name}]);
+	    }
 
 	    return undef;
 	}});		   
@@ -750,7 +770,11 @@ sub register_stop_command {
 	code => sub {
 	    my ($param) = @_;
 	    
-	    $self->stop();
+	    if (&$init_ppid()) {
+		$self->stop();
+	    } else {
+		PVE::Tools::run_command(['systemctl', 'stop', $self->{name}]);
+	    }
 
 	    return undef;
 	}});		   
@@ -801,6 +825,7 @@ sub create_reusable_socket {
 	$socket->fdopen($sockfd, 'w') || 
 	    die "cannot fdopen file descriptor '$sockfd' - $!\n";
 
+	$socket->fcntl(Fcntl::F_SETFD(), Fcntl::FD_CLOEXEC);
     } else {
 
 	$socket = IO::Socket::IP->new(
@@ -820,9 +845,8 @@ sub create_reusable_socket {
 	$ENV{"PVE_DAEMON_SOCKET_$port"} = $socket->fileno;
     }
 
-    # remove FD_CLOEXEC bit to reuse on exec
-    $socket->fcntl(Fcntl::F_SETFD(), 0);
-    
+    push @$daemon_sockets, $socket;
+
     return $socket;
 }