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 040CF7EEBF for ; Thu, 11 Nov 2021 16:18:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ED007E4C8 for ; Thu, 11 Nov 2021 16:17:52 +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 ABD0FE4AD for ; Thu, 11 Nov 2021 16:17:51 +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 864AB42F4F for ; Thu, 11 Nov 2021 16:17:51 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 11 Nov 2021 16:17:43 +0100 Message-Id: <20211111151745.130818-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211111151745.130818-1-f.ebner@proxmox.com> References: <20211111151745.130818-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.190 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 1/3] pvescheduler: simplify code for sleep time calculation 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, 11 Nov 2021 15:18:23 -0000 Signed-off-by: Fabian Ebner --- PVE/Service/pvescheduler.pm | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/PVE/Service/pvescheduler.pm b/PVE/Service/pvescheduler.pm index a8d548fb..86891827 100755 --- a/PVE/Service/pvescheduler.pm +++ b/PVE/Service/pvescheduler.pm @@ -25,20 +25,6 @@ my $finish_jobs = sub { } }; -my $get_sleep_time = sub { - my ($calculate_offset) = @_; - my $time = 60; - - if ($calculate_offset) { - # try to run near minute boundaries, makes more sense to the user as he - # configures jobs with minute precision - my ($current_seconds) = localtime; - $time = (60 - $current_seconds) if (60 - $current_seconds >= 5); - } - - return $time; -}; - sub run { my ($self) = @_; @@ -84,12 +70,12 @@ sub run { $run_jobs->(); - my $sleep_time; + my $sleep_time = 60; if ($count >= 1000) { - $sleep_time = $get_sleep_time->(1); + # Job schedule has minute precision, so try running near the minute boundary. + my ($current_seconds) = localtime; + $sleep_time = (60 - $current_seconds) if (60 - $current_seconds >= 5); $count = 0; - } else { - $sleep_time = $get_sleep_time->(0); } my $slept = 0; # SIGCHLD interrupts sleep, so we need to keep track -- 2.30.2