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 9DC90707B3 for ; Tue, 14 Jun 2022 11:01:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 94AF01C91C for ; Tue, 14 Jun 2022 11:00:50 +0200 (CEST) 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 D65CE1C8F6 for ; Tue, 14 Jun 2022 11:00:49 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9BF5C43701 for ; Tue, 14 Jun 2022 11:00:49 +0200 (CEST) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com Date: Tue, 14 Jun 2022 11:00:11 +0200 Message-Id: <20220614090013.84500-2-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614090013.84500-1-d.tschlatscher@proxmox.com> References: <20220614090013.84500-1-d.tschlatscher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.121 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. [storage.pm] Subject: [pve-devel] [PATCH storage v4 2/4] Adapted unlink calls for archive files in case of ENOENT 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, 14 Jun 2022 09:01:20 -0000 This improves handling when two archive remove calls are creating a race condition where one would formerly encounter an error. Now both finish successfully. Signed-off-by: Daniel Tschlatscher Reviewed-by: Fabian Ebner --- Changes from v3 * No fix #xxxx in commit title PVE/Storage.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 70dd663..97ea64e 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -1586,7 +1586,7 @@ sub archive_remove { die "cannot remove protected archive '$archive_path'\n" if -e protection_file_path($archive_path); - unlink $archive_path or die "removing archive $archive_path failed: $!\n"; + unlink $archive_path or $! == ENOENT or die "removing archive $archive_path failed: $!\n"; archive_auxiliaries_remove($archive_path); } @@ -1602,7 +1602,7 @@ sub archive_auxiliaries_remove { my $path = "$dirname/$filename"; if (-e $path) { - unlink $path or warn "Removing $type file failed: $!\n"; + unlink $path or $! == ENOENT or warn "Removing $type file failed: $!\n"; } } } -- 2.30.2