From: Fiona Ebner <f.ebner@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Philipp Hufnagl <p.hufnagl@proxmox.com>
Subject: Re: [pve-devel] [PATCH storage v4 3/4] pbs: Extraxt check_datastore_exists from activate_storage
Date: Fri, 16 Feb 2024 16:56:43 +0100 [thread overview]
Message-ID: <54b37854-1bff-429d-b9ab-ddd6d2e40487@proxmox.com> (raw)
In-Reply-To: <20231127114001.189590-4-p.hufnagl@proxmox.com>
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 <p.hufnagl@proxmox.com>
> ---
> 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_
next prev parent reply other threads:[~2024-02-16 15:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-27 11:39 [pve-devel] [PATCH storage v4 0/4] pbs: fix #5008: Check if datastore and namespace is valid on add- and update hooks Philipp Hufnagl
2023-11-27 11:39 ` [pve-devel] [PATCH storage v4 1/4] pbs: Move pbs_api_connect earlyer in the code Philipp Hufnagl
2024-02-16 15:56 ` Fiona Ebner
2023-11-27 11:39 ` [pve-devel] [PATCH storage v4 2/4] pbs: Make it possible to reuse PBS connection for datastore API call Philipp Hufnagl
2024-02-16 15:56 ` Fiona Ebner
2023-11-27 11:40 ` [pve-devel] [PATCH storage v4 3/4] pbs: Extraxt check_datastore_exists from activate_storage Philipp Hufnagl
2024-02-16 15:56 ` Fiona Ebner [this message]
2024-02-19 8:34 ` Fiona Ebner
2023-11-27 11:40 ` [pve-devel] [PATCH storage v4 4/4] pbs: fix #5008: Check if datastore and namespace is valid on add- and update hooks Philipp Hufnagl
2024-02-16 15:56 ` Fiona Ebner
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=54b37854-1bff-429d-b9ab-ddd6d2e40487@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=p.hufnagl@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