From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: [pve-devel] applied: [PATCH storage] RBD plugin: path: conditionalize get_rbd_dev_path() call
Date: Tue, 13 Sep 2022 09:56:29 +0200 [thread overview]
Message-ID: <1663055781.31q5fni1yh.astroid@nora.none> (raw)
In-Reply-To: <20220831085054.81178-1-f.ebner@proxmox.com>
thanks!
On August 31, 2022 10:50 am, Fiona Ebner wrote:
> The return value of get_rbd_dev_path() is only used when $scfg->{krbd}
> evaluates to true and the function shouldn't have any side effects
> that are needed later, so the call can be avoided otherwise.
>
> This also saves a RADOS connection and command with configurations for
> external clusters with krbd disabled.
>
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> PVE/Storage/RBDPlugin.pm | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
> index eeeaf3f..d76f930 100644
> --- a/PVE/Storage/RBDPlugin.pm
> +++ b/PVE/Storage/RBDPlugin.pm
> @@ -417,8 +417,10 @@ sub path {
> my ($vtype, $name, $vmid) = $class->parse_volname($volname);
> $name .= '@'.$snapname if $snapname;
>
> - my $rbd_dev_path = get_rbd_dev_path($scfg, $storeid, $name);
> - return ($rbd_dev_path, $vmid, $vtype) if $scfg->{krbd};
> + if ($scfg->{krbd}) {
> + my $rbd_dev_path = get_rbd_dev_path($scfg, $storeid, $name);
> + return ($rbd_dev_path, $vmid, $vtype);
> + }
>
> my $rbd_path = get_rbd_path($scfg, $name);
> my $path = "rbd:${rbd_path}";
> --
> 2.30.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
prev parent reply other threads:[~2022-09-13 7:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 8:50 [pve-devel] " Fiona Ebner
2022-09-13 7:56 ` Fabian Grünbichler [this message]
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=1663055781.31q5fni1yh.astroid@nora.none \
--to=f.gruenbichler@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