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 7D34F69C2D for ; Mon, 14 Mar 2022 11:19:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6D01D2543 for ; Mon, 14 Mar 2022 11:18:51 +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 483A12535 for ; Mon, 14 Mar 2022 11:18:50 +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 2008745928 for ; Mon, 14 Mar 2022 11:18:50 +0100 (CET) Message-ID: <2166d56d-2ddc-bce2-029a-40c8f59e0d12@proxmox.com> Date: Mon, 14 Mar 2022 11:18:49 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.2 Content-Language: en-US To: pve-devel@lists.proxmox.com, Hannes Laimer References: <20220314092657.48696-1-h.laimer@proxmox.com> <20220314092657.48696-2-h.laimer@proxmox.com> <151939ee-75b2-1b4f-d420-16f0641e8f22@proxmox.com> From: Fabian Ebner In-Reply-To: <151939ee-75b2-1b4f-d420-16f0641e8f22@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.123 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) 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 - Subject: Re: [pve-devel] [PATCH pve-manager v3 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: Mon, 14 Mar 2022 10:19:21 -0000 Am 14.03.22 um 11:00 schrieb Fabian Ebner: > Am 14.03.22 um 10:26 schrieb Hannes Laimer: >> Signed-off-by: Hannes Laimer >> @@ -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}; > > If it's not defined, delete shouldn't be necessary anymore. Well, assuming the writer handles that correctly. Actually, I don't mind having the delete here after all.