From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage 1/2] rbd: add fallback default poolname 'rbd' to status
Date: Tue, 3 May 2022 13:31:39 +0200 [thread overview]
Message-ID: <20220503113140.1680807-2-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20220503113140.1680807-1-s.ivanov@proxmox.com>
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>
---
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 91a4a76..c4a69b2 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
--
2.30.2
next prev parent reply other threads:[~2022-05-03 11:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-03 11:31 [pve-devel] [PATCH storage 0/2] rbd: improve errormessages on missing/wrong poolname Stoiko Ivanov
2022-05-03 11:31 ` Stoiko Ivanov [this message]
2022-05-03 11:31 ` [pve-devel] [PATCH storage 2/2] rbd: warn if no stats for a pool could be gathered Stoiko Ivanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220503113140.1680807-2-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox