pvescheduler: run jobs from jobs.cfg

PVE/Jobs is responsible to decide if the job must run (e.g. with a
schedule)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/PVE/Service/pvescheduler.pm b/PVE/Service/pvescheduler.pm
index 96d84e209c7d7cc54dc5e54f5cdfb9f67000db07..a8d548fb5e12491cf7b7dd3484994b52e9393bcf 100755 (executable)
--- a/PVE/Service/pvescheduler.pm
+++ b/PVE/Service/pvescheduler.pm
@@ -6,6 +6,7 @@ use warnings;
 use POSIX qw(WNOHANG);
 use PVE::SafeSyslog;
 use PVE::API2::Replication;
+use PVE::Jobs;
 
 use PVE::Daemon;
 use base qw(PVE::Daemon);
@@ -51,19 +52,31 @@ sub run {
        $old_sig_chld->(@_) if $old_sig_chld;
     };
 
-    my $run_jobs = sub {
+    my $fork = sub {
+       my ($sub) = @_;
        my $child = fork();
        if (!defined($child)) {
            die "fork failed: $!\n";
        } elsif ($child == 0) {
            $self->after_fork_cleanup();
-           PVE::API2::Replication::run_jobs(undef, sub {}, 0, 1);
+           $sub->();
            POSIX::_exit(0);
        }
 
        $jobs->{$child} = 1;
     };
 
+    my $run_jobs = sub {
+
+       $fork->(sub {
+           PVE::API2::Replication::run_jobs(undef, sub {}, 0, 1);
+       });
+
+       $fork->(sub {
+           PVE::Jobs::run_jobs();
+       });
+    };
+
     PVE::Jobs::setup_dirs();
 
     for (my $count = 1000;;$count++) {