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 4DE986A04A for ; Tue, 15 Mar 2022 11:52:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3D2C41D03B for ; Tue, 15 Mar 2022 11:52:22 +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 9EB121D032 for ; Tue, 15 Mar 2022 11:52:21 +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 74148419E6 for ; Tue, 15 Mar 2022 11:52:21 +0100 (CET) From: Hannes Laimer To: pve-devel@lists.proxmox.com Date: Tue, 15 Mar 2022 10:52:14 +0000 Message-Id: <20220315105214.4718-1-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220314092657.48696-2-h.laimer@proxmox.com> References: <20220314092657.48696-2-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.038 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. [plugin.pm, vzdump.pm, jobs.pm] Subject: [pve-devel] [PATCH pve-manager v4 1/3] fix #3903: jobs: add remove vmid from jobs helper 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: Tue, 15 Mar 2022 10:52:52 -0000 Signed-off-by: Hannes Laimer --- v3->v4: - fix signature in base plugin - die in base plugin PVE/Jobs.pm | 21 ++++++++++++++++++++- PVE/Jobs/Plugin.pm | 6 ++++++ PVE/Jobs/VZDump.pm | 13 +++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/PVE/Jobs.pm b/PVE/Jobs.pm index ba3685ec..5b2c4c7b 100644 --- a/PVE/Jobs.pm +++ b/PVE/Jobs.pm @@ -4,7 +4,7 @@ use strict; use warnings; use JSON; -use PVE::Cluster qw(cfs_read_file cfs_lock_file); +use PVE::Cluster qw(cfs_read_file cfs_lock_file cfs_write_file); use PVE::Jobs::Plugin; use PVE::Jobs::VZDump; use PVE::Tools; @@ -274,6 +274,25 @@ sub synchronize_job_states_with_config { die $@ if $@; } +sub remove_vmid_from_jobs { + my ($vmid) = @_; + + cfs_lock_file('jobs.cfg', undef, sub { + my $jobs_data = cfs_read_file('jobs.cfg'); + for my $id (keys %{$jobs_data->{ids}}) { + my $job = $jobs_data->{ids}->{$id}; + my $type = $job->{type}; + my $plugin = PVE::Jobs::Plugin->lookup($type); + $jobs_data->{ids}->{$id} = $plugin->remove_vmid_from_job($job, $vmid); + if (!defined($jobs_data->{ids}->{$id})) { + delete $jobs_data->{ids}->{$id}; + remove_job($id, $type); + } + } + cfs_write_file('jobs.cfg', $jobs_data); + }); +} + sub setup_dirs { mkdir $state_dir; mkdir $lock_dir; diff --git a/PVE/Jobs/Plugin.pm b/PVE/Jobs/Plugin.pm index 6098360b..1900fe43 100644 --- a/PVE/Jobs/Plugin.pm +++ b/PVE/Jobs/Plugin.pm @@ -80,6 +80,12 @@ sub encode_value { return $plugin->encode_value($type, $key, $value); } +sub remove_vmid_from_job { + my ($class, $job, $vmid) = @_; + + die "remove_vmid_from_job: implemented in subclass"; +} + sub write_config { my ($class, $filename, $cfg) = @_; diff --git a/PVE/Jobs/VZDump.pm b/PVE/Jobs/VZDump.pm index 44fe33dc..3aaa66b8 100644 --- a/PVE/Jobs/VZDump.pm +++ b/PVE/Jobs/VZDump.pm @@ -64,6 +64,19 @@ sub encode_value { return $value; } +sub remove_vmid_from_job { + my ($class, $job, $vmid) = @_; + + if (defined($job->{vmid})) { + $job->{vmid} = join(',', grep { $_ ne $vmid } PVE::Tools::split_list($job->{vmid})); + undef $job if $job->{vmid} eq ''; + } elsif (defined($job->{exclude})) { + $job->{exclude} = join(',', grep { $_ ne $vmid } PVE::Tools::split_list($job->{exclude})); + delete $job->{exclude} if $job->{exclude} eq ''; + } + return $job; +} + sub run { my ($class, $conf) = @_; -- 2.30.2