From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CE44192836 for ; Tue, 13 Sep 2022 09:56:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C11CC1E765 for ; Tue, 13 Sep 2022 09:56:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 13 Sep 2022 09:56:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C3366437D2 for ; Tue, 13 Sep 2022 09:56:35 +0200 (CEST) Date: Tue, 13 Sep 2022 09:56:29 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20220831085054.81178-1-f.ebner@proxmox.com> In-Reply-To: <20220831085054.81178-1-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1663055781.31q5fni1yh.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.159 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rbdplugin.pm, proxmox.com] Subject: [pve-devel] applied: [PATCH storage] RBD plugin: path: conditionalize get_rbd_dev_path() call X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2022 07:56:42 -0000 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. >=20 > This also saves a RADOS connection and command with configurations for > external clusters with krbd disabled. >=20 > Signed-off-by: Fiona Ebner > --- > PVE/Storage/RBDPlugin.pm | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) >=20 > 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) =3D $class->parse_volname($volname); > $name .=3D '@'.$snapname if $snapname; > =20 > - my $rbd_dev_path =3D get_rbd_dev_path($scfg, $storeid, $name); > - return ($rbd_dev_path, $vmid, $vtype) if $scfg->{krbd}; > + if ($scfg->{krbd}) { > + my $rbd_dev_path =3D get_rbd_dev_path($scfg, $storeid, $name); > + return ($rbd_dev_path, $vmid, $vtype); > + } > =20 > my $rbd_path =3D get_rbd_path($scfg, $name); > my $path =3D "rbd:${rbd_path}"; > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20