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 B946898BDD for ; Wed, 15 Nov 2023 17:00:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A23C5A1A4 for ; Wed, 15 Nov 2023 17:00:51 +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 ; Wed, 15 Nov 2023 17:00:50 +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 7A74841F21 for ; Wed, 15 Nov 2023 17:00:50 +0100 (CET) From: Philipp Hufnagl To: pve-devel@lists.proxmox.com Date: Wed, 15 Nov 2023 17:00:40 +0100 Message-Id: <20231115160042.177037-3-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115160042.177037-1-p.hufnagl@proxmox.com> References: <20231115160042.177037-1-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.058 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: [pve-devel] [PATCH storage v2 2/4] pbs: Make it possible to reuse PBS connection for datastore API 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: Wed, 15 Nov 2023 16:00:51 -0000 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 --- 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