From 0c317c6c0f257ec1f53a538f5b07b12d6f35cc7a Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Tue, 3 May 2022 13:31:39 +0200 Subject: [PATCH] rbd: add fallback default poolname 'rbd' to status the fallback to a default pool name of 'rbd' was introduced in: 1440604a4b072b88cc1e4f8bbae4511b50d1d68e and worked for the status command, because it used the `rados_cmd` sub. This fallback was lost with the changes in: 41aacc6cdeea9b0c8007cbfb280acf827932c3d6 leading to confusing errors: `Use of uninitialized value in string eq at \ /usr/share/perl5/PVE/Storage/RBDPlugin.pm line 633` (e.g. in the journal from pvestatd) Signed-off-by: Stoiko Ivanov --- PVE/Storage/RBDPlugin.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 22cac22..9ee6a37 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -630,7 +630,9 @@ sub status { my $rados = $librados_connect->($scfg, $storeid); my $df = $rados->mon_command({ prefix => 'df', format => 'json' }); - my ($d) = grep { $_->{name} eq $scfg->{pool} } @{$df->{pools}}; + my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; + + my ($d) = grep { $_->{name} eq $pool } @{$df->{pools}}; # max_avail -> max available space for data w/o replication in the pool # bytes_used -> data w/o replication in the pool