5
0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-02-25 17:57:31 +03:00

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 <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2022-05-03 13:31:39 +02:00 committed by Thomas Lamprecht
parent f49c6cde16
commit 0c317c6c0f

View File

@ -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