From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E73771FF171 for ; Fri, 13 Dec 2024 17:30:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3FF3112B8D; Fri, 13 Dec 2024 17:30:45 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 13 Dec 2024 17:30:34 +0100 Message-Id: <20241213163037.91508-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241213163037.91508-1-f.ebner@proxmox.com> References: <20241213163037.91508-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.054 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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. [rbdplugin.pm] Subject: [pve-devel] [PATCH storage 3/6] rbd plugin: factor out helper to check if volume already exists 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" Signed-off-by: Fiona Ebner --- NOTE: the helper seems a bit brittle and does not distinguish between the volume not existing and another error. While allocation or renaming later still fail with an error, improving the helper seems worthwhile src/PVE/Storage/RBDPlugin.pm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm index 680e922..301918c 100644 --- a/src/PVE/Storage/RBDPlugin.pm +++ b/src/PVE/Storage/RBDPlugin.pm @@ -348,6 +348,16 @@ sub rbd_volume_du { die "got no matching image from rbd du\n"; } +my sub rbd_volume_exists { + my ($scfg, $storeid, $volname) = @_; + + eval { + my $cmd = $rbd_cmd->($scfg, $storeid, 'info', $volname); + run_rbd_command($cmd, errmsg => "exist check", quiet => 1); + }; + return $@ ? undef : 1; +} + # Configuration sub type { @@ -869,11 +879,8 @@ sub rename_volume { $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid, $format) if !$target_volname; - eval { - my $cmd = $rbd_cmd->($scfg, $storeid, 'info', $target_volname); - run_rbd_command($cmd, errmsg => "exist check", quiet => 1); - }; - die "target volume '${target_volname}' already exists\n" if !$@; + die "target volume '${target_volname}' already exists\n" + if rbd_volume_exists($scfg, $storeid, $target_volname); my $cmd = $rbd_cmd->($scfg, $storeid, 'rename', $source_image, $target_volname); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel