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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 677C67D07E for ; Mon, 8 Nov 2021 14:08:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5709E251AD for ; Mon, 8 Nov 2021 14:08:03 +0100 (CET) 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 2BEE225164 for ; Mon, 8 Nov 2021 14:07:59 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 02CF146064 for ; Mon, 8 Nov 2021 14:07:59 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 8 Nov 2021 14:07:55 +0100 Message-Id: <20211108130758.160914-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211108130758.160914-1-d.csapak@proxmox.com> References: <20211108130758.160914-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.236 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 Subject: [pve-devel] [PATCH manager v2 3/6] 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: Mon, 08 Nov 2021 13:08:03 -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 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/PVE/Service/pvescheduler.pm b/PVE/Service/pvescheduler.pm index 96d84e20..a8d548fb 100755 --- 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++) { -- 2.30.2