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 14F851FF163 for ; Thu, 19 Dec 2024 11:43:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5274ADAA; Thu, 19 Dec 2024 11:43:24 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 19 Dec 2024 11:43:09 +0100 Message-Id: <20241219104316.35329-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241219104316.35329-1-f.ebner@proxmox.com> References: <20241219104316.35329-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] [PATCH storage v3 06/13] rbd plugin: improve volume exists 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: , 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" Currently, the helper would not distinguish between different kinds of errors. Instead of relying on an error, list the images and check there. Signed-off-by: Fiona Ebner --- Changes in v3: * do not match error message, list images instead src/PVE/Storage/RBDPlugin.pm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm index 44770b0..1d1cfad 100644 --- a/src/PVE/Storage/RBDPlugin.pm +++ b/src/PVE/Storage/RBDPlugin.pm @@ -357,11 +357,24 @@ sub rbd_volume_du { 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; + my $cmd = $rbd_cmd->($scfg, $storeid, 'ls', '--format', 'json'); + my $raw = ''; + run_rbd_command( + $cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => sub { $raw .= shift; }); + + my $list; + if ($raw =~ m/^(\[.*\])$/s) { # untaint + $list = eval { JSON::decode_json($1); }; + die "invalid JSON output from 'rbd ls': $@\n" if $@; + } else { + die "got unexpected data from 'rbd ls': '$raw'\n"; + } + + for my $name ($list->@*) { + return 1 if $name eq $volname; + } + + return 0; } # Configuration -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel