From e2cf3cea9674f5486b6c139259e0d3dcc70aa5cf Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Thu, 19 Dec 2024 11:43:09 +0100 Subject: [PATCH] rbd plugin: improve volume exists helper 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 --- 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