From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 5/7] pvescheduler: run jobs from jobs.cfg
Date: Thu, 7 Oct 2021 10:27:25 +0200 [thread overview]
Message-ID: <20211007082727.1385888-7-d.csapak@proxmox.com> (raw)
In-Reply-To: <20211007082727.1385888-1-d.csapak@proxmox.com>
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>
---
PVE/Service/pvescheduler.pm | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/PVE/Service/pvescheduler.pm b/PVE/Service/pvescheduler.pm
index ce55c45a..81f6b089 100644
--- 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);
@@ -39,19 +40,33 @@ sub run {
my $logfunc = sub { syslog('info', $_[0]) };
- 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, $logfunc, 0, 1);
+ $sub->();
POSIX::_exit(0);
}
$jobs->{$child} = 1;
};
+ my $run_jobs = sub {
+
+ $fork->(sub {
+ PVE::API2::Replication::run_jobs(undef, $logfunc, 0, 1);
+ });
+
+ $fork->(sub {
+ PVE::Jobs::run_jobs();
+ });
+ };
+
+ PVE::Jobs::setup_dirs();
+
# try to run near minute boundaries, makes more sense to the user as he
# configures jobs with minute precision
my ($current_seconds) = localtime;
--
2.30.2
next prev parent reply other threads:[~2021-10-07 8:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 8:27 [pve-devel] [PATCH cluster/manager] add scheduling daemon for pvesr + vzdump (and more) Dominik Csapak
2021-10-07 8:27 ` [pve-devel] [PATCH cluster 1/1] add 'jobs.cfg' to observed files Dominik Csapak
2021-10-07 8:27 ` [pve-devel] [PATCH manager 1/7] replace systemd timer with pvescheduler daemon Dominik Csapak
2021-10-29 12:05 ` Fabian Ebner
2021-11-02 9:26 ` Dominik Csapak
2021-10-07 8:27 ` [pve-devel] [PATCH manager 2/7] postinst: use reload-or-restart instead of reload-or-try-restart Dominik Csapak
2021-10-07 8:38 ` [pve-devel] applied: " Thomas Lamprecht
2021-10-07 8:27 ` [pve-devel] [PATCH manager 3/7] api/backup: refactor string for all days Dominik Csapak
2021-10-07 8:27 ` [pve-devel] [PATCH manager 4/7] add PVE/Jobs to handle VZDump jobs Dominik Csapak
2021-11-02 13:52 ` Fabian Ebner
2021-11-02 14:33 ` Dominik Csapak
2021-11-03 7:37 ` Fabian Ebner
2021-10-07 8:27 ` Dominik Csapak [this message]
2021-10-07 8:27 ` [pve-devel] [PATCH manager 6/7] api/backup: handle new vzdump jobs Dominik Csapak
2021-11-03 9:05 ` Fabian Ebner
2021-10-07 8:27 ` [pve-devel] [PATCH manager 7/7] ui: dc/backup: show id+schedule instead of dow+starttime Dominik Csapak
2021-11-03 9:21 ` Fabian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211007082727.1385888-7-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox