proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-27 11:46:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pvescheduler: record some todos and small cleanup

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-11-22 20:25:34 +01:00
parent 427a5cb429
commit d4eb0c1993
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/Service/pvescheduler.pm
View File

@ -37,7 +37,6 @@ sub hup {
for my $type (@JOB_TYPES) { for my $type (@JOB_TYPES) {
my $worker = $self->{jobs}->{$type} // next; my $worker = $self->{jobs}->{$type} // next;
$old_workers .= "$type:$_;" for keys $worker->%*; $old_workers .= "$type:$_;" for keys $worker->%*;
print "passing on still running workers to reloaded daemon\n";
} }
$ENV{"PVE_DAEMON_WORKER_PIDS"} = $old_workers; $ENV{"PVE_DAEMON_WORKER_PIDS"} = $old_workers;
$self->{got_hup_signal} = 1; $self->{got_hup_signal} = 1;
@ -93,6 +92,11 @@ sub run {
}; };
my $run_jobs = sub { my $run_jobs = sub {
# TODO: actually integrate replication in PVE::Jobs and do not always fork here, we could
# do the state lookup and check if there's new work scheduled before doing so, e.g., by
# extending the PVE::Jobs interfacae e.g.;
# my $scheduled_jobs = PVE::Jobs::get_pending() or return;
# forked { PVE::Jobs::run_jobs($scheduled_jobs) }
$fork->('replication', sub { $fork->('replication', sub {
PVE::API2::Replication::run_jobs(undef, sub {}, 0, 1); PVE::API2::Replication::run_jobs(undef, sub {}, 0, 1);
@ -106,9 +110,8 @@ sub run {
PVE::Jobs::setup_dirs(); PVE::Jobs::setup_dirs();
for (my $count = 1000;;$count++) { for (my $count = 1000;;$count++) {
last if $self->{shutdown_request}; return if $self->{got_hup_signal}; # keep workers running, PVE::Daemon re-execs us on return
# we got a reload signal, return gracefully and leave the forks running last if $self->{shutdown_request}; # exit main-run loop for shutdown
return if $self->{got_hup_signal};
$run_jobs->(); $run_jobs->();
@ -124,6 +127,8 @@ sub run {
while ($slept < $sleep_time) { while ($slept < $sleep_time) {
last if $self->{shutdown_request} || $self->{got_hup_signal}; last if $self->{shutdown_request} || $self->{got_hup_signal};
$slept += sleep($sleep_time - $slept); $slept += sleep($sleep_time - $slept);
# TODO: check if there's new work to do, e.g., if a job finished
# that had a longer runtime than run period
} }
} }