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 0037774E17 for ; Thu, 2 Jun 2022 09:42:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E84C02B9 for ; Thu, 2 Jun 2022 09:42:08 +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 81E922EB for ; Thu, 2 Jun 2022 09:42:07 +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 5539D42895 for ; Thu, 2 Jun 2022 09:42:07 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 2 Jun 2022 09:42:04 +0200 Message-Id: <20220602074206.814493-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602074206.814493-1-d.csapak@proxmox.com> References: <20220602074206.814493-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.111 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [backup.pm] Subject: [pve-devel] [PATCH manager v2 2/3] fix #4053: don't run vzdump jobs when they change from disabled->enabled 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, 02 Jun 2022 07:42:39 -0000 by updating the timestamp in the job state when enabled is changing from 0 -> 1. We do it this way too in PBS for example, and is the more sensible behaviour. Signed-off-by: Dominik Csapak --- PVE/API2/Backup.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/PVE/API2/Backup.pm b/PVE/API2/Backup.pm index ced48977..54789270 100644 --- a/PVE/API2/Backup.pm +++ b/PVE/API2/Backup.pm @@ -454,6 +454,8 @@ __PACKAGE__->register_method({ die "no such vzdump job\n" if !$job || $job->{type} ne 'vzdump'; } + my $old_enabled = $job->{enabled} // 1; + my $deletable = { comment => 1, 'repeat-missed' => 1, @@ -467,15 +469,21 @@ __PACKAGE__->register_method({ delete $job->{$k}; } - my $schedule_updated = 0; + my $need_run_time_update = 0; if (defined($param->{schedule}) && $param->{schedule} ne $job->{schedule}) { - $schedule_updated = 1; + $need_run_time_update = 1; } foreach my $k (keys %$param) { $job->{$k} = $param->{$k}; } + my $new_enabled = $job->{enabled} // 1; + + if ($new_enabled && !$old_enabled) { + $need_run_time_update = 1; + } + $job->{all} = 1 if (defined($job->{exclude}) && !defined($job->{pool})); if (defined($param->{vmid})) { @@ -493,7 +501,7 @@ __PACKAGE__->register_method({ PVE::VZDump::verify_vzdump_parameters($job, 1); - if ($schedule_updated) { + if ($need_run_time_update) { PVE::Jobs::updated_job_schedule($id, 'vzdump'); } -- 2.30.2