From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id CDC9B1FF170 for ; Tue, 17 Dec 2024 16:49:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5BDD5528B; Tue, 17 Dec 2024 16:48:53 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 17 Dec 2024 16:48:12 +0100 Message-Id: <20241217154814.82121-9-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241217154814.82121-1-f.ebner@proxmox.com> References: <20241217154814.82121-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Subject: [pve-devel] [RFC v2 storage 08/10] rbd plugin: volume exists helper: distinguish between different errors 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Only claim that the image does not exist if the error message indicates it. Signed-off-by: Fiona Ebner --- If we don't want to match the error, I'll switch the helper over to list volumes and check there. New in v2. src/PVE/Storage/RBDPlugin.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm index 0e53888..004842b 100644 --- a/src/PVE/Storage/RBDPlugin.pm +++ b/src/PVE/Storage/RBDPlugin.pm @@ -355,7 +355,11 @@ my sub rbd_volume_exists { my $cmd = $rbd_cmd->($scfg, $storeid, 'info', $volname); run_rbd_command($cmd, errmsg => "exist check", quiet => 1); }; - return $@ ? undef : 1; + if (my $err = $@) { + return if $err =~ m/No such file or directory$/; + die $err; + } + return 1; } # Configuration -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel