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 C419663FC4 for ; Tue, 1 Mar 2022 09:52:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BAB741D5E8 for ; Tue, 1 Mar 2022 09:52:00 +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 B169A1D5CC for ; Tue, 1 Mar 2022 09:51: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 5627846B8E for ; Tue, 1 Mar 2022 09:51:59 +0100 (CET) From: Hannes Laimer To: pve-devel@lists.proxmox.com Date: Tue, 1 Mar 2022 08:51:51 +0000 Message-Id: <20220301085153.31445-2-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220301085153.31445-1-h.laimer@proxmox.com> References: <20220301085153.31445-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.041 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] Subject: [pve-devel] [PATCH pve-manager 1/3] fix #3903: jobs-plugin: 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, 01 Mar 2022 08:52:30 -0000 Signed-off-by: Hannes Laimer --- PVE/Jobs/Plugin.pm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/PVE/Jobs/Plugin.pm b/PVE/Jobs/Plugin.pm index 6098360b..4883a193 100644 --- a/PVE/Jobs/Plugin.pm +++ b/PVE/Jobs/Plugin.pm @@ -3,7 +3,7 @@ package PVE::Jobs::Plugin; use strict; use warnings; -use PVE::Cluster qw(cfs_register_file); +use PVE::Cluster qw(cfs_register_file cfs_lock_file cfs_read_file cfs_write_file); use base qw(PVE::SectionConfig); @@ -92,6 +92,23 @@ sub write_config { $class->SUPER::write_config($filename, $cfg); } +sub remove_vmid_from_jobs { + my ($vmid) = @_; + cfs_lock_file('jobs.cfg', undef, sub { + my $jobs_data = cfs_read_file('jobs.cfg'); + while((my $id, my $job) = each (%{$jobs_data->{ids}})){ + next if !defined($job->{vmid}); + $job->{vmid} = join(',', grep { $_ ne $vmid } PVE::Tools::split_list($job->{vmid})); + if ($job->{vmid} eq '') { + delete $jobs_data->{ids}->{$id}; + } else { + $jobs_data->{ids}->{$id} = $job; + } + } + cfs_write_file('jobs.cfg', $jobs_data); + }); +} + sub run { my ($class, $cfg) = @_; # implement in subclass -- 2.30.2