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 69467992A8 for ; Thu, 16 Nov 2023 10:43:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5243710EC0 for ; Thu, 16 Nov 2023 10:43:53 +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 ; Thu, 16 Nov 2023 10:43:52 +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 5EF86436A7 for ; Thu, 16 Nov 2023 10:43:52 +0100 (CET) Date: Thu, 16 Nov 2023 10:43:51 +0100 (CET) From: Christian Ebner To: Proxmox VE development discussion , Philipp Hufnagl Message-ID: <1746898787.3889.1700127831529@webmail.proxmox.com> In-Reply-To: <20231115160042.177037-4-p.hufnagl@proxmox.com> References: <20231115160042.177037-1-p.hufnagl@proxmox.com> <20231115160042.177037-4-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.6-Rev54 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.055 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 v2 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: Thu, 16 Nov 2023 09:43:53 -0000 Typi in heading s/Extraxt/Extract, maybe call it factor out instead. > On 15.11.2023 17:00 CET Philipp Hufnagl wrote: > > > Parts contained in activate_storage are needed to be run to fix #5008, > however, implementing a namespace check there would cause unneded > overhead. Typo s/unneded/unneeded. > > Therfore, this patch extracts the method check_datastore_exists from > activate storage. Typo s/Thefore/Therefore. > > 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 81df21e..104fe15 100644 > --- a/src/PVE/Storage/PBSPlugin.pm > +++ b/src/PVE/Storage/PBSPlugin.pm > @@ -819,17 +819,13 @@ sub scan_datastores { > > return $response; > } > - > -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; > @@ -839,6 +835,14 @@ sub activate_storage { > die "$storeid: Cannot find datastore '$datastore', check permissions and existence!\n"; > } > > +sub activate_storage { > + my ($class, $storeid, $scfg, $cache) = @_; > + > + my $password = pbs_get_password($scfg, $storeid); > + my $conn = pbs_api_connect($scfg, $password); > + check_datastore_exists($class, $storeid, $scfg, $password, $conn); > +} > + > sub deactivate_storage { > my ($class, $storeid, $scfg, $cache) = @_; > return 1; > -- > 2.39.2 > > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel