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 4853395038 for ; Tue, 17 Jan 2023 12:47:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C1D3AF00 for ; Tue, 17 Jan 2023 12:47:02 +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 for ; Tue, 17 Jan 2023 12:47:01 +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 A9D1944CB8 for ; Tue, 17 Jan 2023 12:47:00 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 17 Jan 2023 12:46:56 +0100 Message-Id: <20230117114659.2397499-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230117114659.2397499-1-d.csapak@proxmox.com> References: <20230117114659.2397499-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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 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 manager v3 1/4] Jobs: include existing types in state file regex for deletion 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, 17 Jan 2023 11:47:02 -0000 otherwise, we cannot correctly match types that contain a hyphen, since the id itself can also contain those. creating a regex where the first part is the concrete allowed types followed by a hyphen + id can also match those. Signed-off-by: Dominik Csapak --- PVE/Jobs.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PVE/Jobs.pm b/PVE/Jobs.pm index 86ce9f693..70cb48212 100644 --- a/PVE/Jobs.pm +++ b/PVE/Jobs.pm @@ -324,7 +324,10 @@ sub synchronize_job_states_with_config { } } - PVE::Tools::dir_glob_foreach($state_dir, '(.*?)-(.*).json', sub { + my $valid_types = PVE::Job::Registry->lookup_types(); + my $type_regex = join("|", $valid_types->@*); + + PVE::Tools::dir_glob_foreach($state_dir, "(${type_regex})-(.*).json", sub { my ($path, $type, $id) = @_; if (!defined($data->{ids}->{$id})) { -- 2.30.2