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 0DC3C647BC for ; Thu, 3 Mar 2022 18:10:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 00792352EB for ; Thu, 3 Mar 2022 18:10:50 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CF60E352DF for ; Thu, 3 Mar 2022 18:10:48 +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 9208E41979 for ; Thu, 3 Mar 2022 18:10:48 +0100 (CET) From: Hannes Laimer To: pve-devel@lists.proxmox.com Date: Thu, 3 Mar 2022 17:10:42 +0000 Message-Id: <20220303171042.82401-1-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220303160524.75510-2-h.laimer@proxmox.com> References: <20220303160524.75510-2-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 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. [jobs.pm] Subject: [pve-devel] [PATCH pve-manager v2 1/3][FIXUP] 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: Thu, 03 Mar 2022 17:10:50 -0000 Signed-off-by: Hannes Laimer --- FIXUP: sort was not needed and should not have been there PVE/Jobs.pm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/PVE/Jobs.pm b/PVE/Jobs.pm index ba3685ec..ea41523b 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,22 @@ 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 $vmids = \$jobs_data->{ids}->{$id}->{vmid}; + next if !defined($$vmids); + + $$vmids = join(',', grep { $_ ne $vmid } PVE::Tools::split_list($$vmids)); + delete $jobs_data->{ids}->{$id} if $$vmids eq ''; + } + cfs_write_file('jobs.cfg', $jobs_data); + }); +} + sub setup_dirs { mkdir $state_dir; mkdir $lock_dir; -- 2.30.2