From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 6DA5273463 for ; Thu, 7 Oct 2021 10:27:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1439016754 for ; Thu, 7 Oct 2021 10:27:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DCBF716631 for ; Thu, 7 Oct 2021 10:27:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5C9D94588A for ; Thu, 7 Oct 2021 10:27:28 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 7 Oct 2021 10:27:25 +0200 Message-Id: <20211007082727.1385888-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211007082727.1385888-1-d.csapak@proxmox.com> References: <20211007082727.1385888-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.307 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pvescheduler.pm] Subject: [pve-devel] [PATCH manager 5/7] pvescheduler: run jobs from jobs.cfg X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Oct 2021 08:27:42 -0000 PVE/Jobs is responsible to decide if the job must run (e.g. with a schedule) Signed-off-by: Dominik Csapak --- 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