From: Philipp Hufnagl <p.hufnagl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage v2 2/4] pbs: Make it possible to reuse PBS connection for datastore API call
Date: Wed, 15 Nov 2023 17:00:40 +0100 [thread overview]
Message-ID: <20231115160042.177037-3-p.hufnagl@proxmox.com> (raw)
In-Reply-To: <20231115160042.177037-1-p.hufnagl@proxmox.com>
It would be nice to reuse an existing PBS connection for scan_datastore.
Because scan_datastore is used multiple in the code, it can not be
canged without breaking existing code.
This change add an optional connection parameter to scan_datastore. If
it is passed it will use this connection. If not, it will create a new
one.
Signed-off-by: Philipp Hufnagl <p.hufnagl@proxmox.com>
---
src/PVE/Storage/PBSPlugin.pm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/PVE/Storage/PBSPlugin.pm b/src/PVE/Storage/PBSPlugin.pm
index 96373a4..81df21e 100644
--- a/src/PVE/Storage/PBSPlugin.pm
+++ b/src/PVE/Storage/PBSPlugin.pm
@@ -808,9 +808,11 @@ sub status {
# fingerprint (optional for trusted certs)
# }
sub scan_datastores {
- my ($scfg, $password) = @_;
+ my ($scfg, $password, $conn) = @_;
- my $conn = pbs_api_connect($scfg, $password);
+ if (!defined($conn)){
+ $conn = pbs_api_connect($scfg, $password);
+ }
my $response = eval { $conn->get('/api2/json/admin/datastore', {}) };
die "error fetching datastores - $@" if $@;
--
2.39.2
next prev parent reply other threads:[~2023-11-15 16:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 16:00 [pve-devel] [PATCH storage v2 0/4] pbs: fix #5008: Prevent adding pbs storage with invalid namespace Philipp Hufnagl
2023-11-15 16:00 ` [pve-devel] [PATCH storage v2 1/4] pbs: Move pbs_api_connect earlyer in the code Philipp Hufnagl
2023-11-15 16:00 ` Philipp Hufnagl [this message]
2023-11-16 9:40 ` [pve-devel] [PATCH storage v2 2/4] pbs: Make it possible to reuse PBS connection for datastore API call Christian Ebner
2023-11-15 16:00 ` [pve-devel] [PATCH storage v2 3/4] pbs: Extraxt check_datastore_exists from activate_storage Philipp Hufnagl
2023-11-16 9:43 ` Christian Ebner
2023-11-15 16:00 ` [pve-devel] [PATCH storage v2 4/4] pbs: fix #5008: Check if datastore and namespace is valid on add- and update hooks Philipp Hufnagl
2023-11-16 9:45 ` Christian Ebner
2023-11-16 9:57 ` Fiona Ebner
2023-11-16 10:45 ` Philipp Hufnagl
2023-11-16 11:04 ` 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=20231115160042.177037-3-p.hufnagl@proxmox.com \
--to=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