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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3B5B2922A9 for ; Fri, 16 Feb 2024 16:56:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2272E5CAE for ; Fri, 16 Feb 2024 16:56:45 +0100 (CET) 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 ; Fri, 16 Feb 2024 16:56:44 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 684FD48577 for ; Fri, 16 Feb 2024 16:56:44 +0100 (CET) Message-ID: <54b37854-1bff-429d-b9ab-ddd6d2e40487@proxmox.com> Date: Fri, 16 Feb 2024 16:56:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Proxmox VE development discussion , Philipp Hufnagl References: <20231127114001.189590-1-p.hufnagl@proxmox.com> <20231127114001.189590-4-p.hufnagl@proxmox.com> From: Fiona Ebner In-Reply-To: <20231127114001.189590-4-p.hufnagl@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.071 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 - Subject: Re: [pve-devel] [PATCH storage v4 3/4] pbs: Extraxt check_datastore_exists from activate_storage 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: Fri, 16 Feb 2024 15:56:45 -0000 Am 27.11.23 um 12:40 schrieb Philipp Hufnagl: > Parts contained in activate_storage are needed to be run to fix #5008, > however, implementing a namespace check there would cause unneeded > overhead. > > Therefore, this patch extracts the method check_datastore_exists from > activate storage. > > Signed-off-by: Philipp Hufnagl > --- > src/PVE/Storage/PBSPlugin.pm | 20 ++++++++++++-------- > 1 file changed, 12 insertions(+), 8 deletions(-) > > diff --git a/src/PVE/Storage/PBSPlugin.pm b/src/PVE/Storage/PBSPlugin.pm > index b4d7914..3e0e155 100644 > --- a/src/PVE/Storage/PBSPlugin.pm > +++ b/src/PVE/Storage/PBSPlugin.pm > @@ -817,17 +817,13 @@ sub scan_datastores { > > return $response; > } > - Style nit: there is no blank line between the subs anymore > -sub activate_storage { > - my ($class, $storeid, $scfg, $cache) = @_; > - > - my $password = pbs_get_password($scfg, $storeid); > - > - my $datastores = eval { scan_datastores($scfg, $password) }; > - die "$storeid: $@" if $@; > +sub check_datastore_exists { > + my ($class, $storeid, $scfg, $password, $conn) = @_; > > my $datastore = $scfg->{datastore}; > > + my $datastores = eval { scan_datastores($scfg, $password, $conn) }; > + die "$storeid: $@" if $@; > for my $ds (@$datastores) { > if ($ds->{store} eq $datastore) { > return 1; > @@ -837,6 +833,14 @@ sub activate_storage { > die "$storeid: Cannot find datastore '$datastore', check permissions and existence!\n"; > } > Since the function dies, it should rather be named assert_ and not check_