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 144468A60F for ; Wed, 17 Aug 2022 12:33:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 01E3526052 for ; Wed, 17 Aug 2022 12:32:45 +0200 (CEST) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 17 Aug 2022 12:32:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 48E8744481 for ; Wed, 17 Aug 2022 12:32:38 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 17 Aug 2022 12:32:37 +0200 Message-Id: <20220817103237.176084-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.273 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pbsplugin.pm] Subject: [pve-devel] [PATCH storage] fix #4189: pbs: bump list_volumes timeout to 2mins 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, 17 Aug 2022 10:33:15 -0000 When switching this from calling the external binary to using the perl api client the timeout got reduced to 7 seconds, which is definitely insufficient for larger stores. Signed-off-by: Wolfgang Bumiller --- PVE/Storage/PBSPlugin.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PVE/Storage/PBSPlugin.pm b/PVE/Storage/PBSPlugin.pm index afc6ea4..603529f 100644 --- a/PVE/Storage/PBSPlugin.pm +++ b/PVE/Storage/PBSPlugin.pm @@ -688,7 +688,7 @@ my sub snapshot_files_encrypted { # TODO: use a client with native rust/proxmox-backup bindings to profit from # API schema checks and types my sub pbs_api_connect { - my ($scfg, $password) = @_; + my ($scfg, $password, $timeout) = @_; my $params = {}; @@ -709,7 +709,7 @@ my sub pbs_api_connect { %$params, host => $scfg->{server}, port => $scfg->{port} // 8007, - timeout => 7, # cope with a 401 (3s api delay) and high latency + timeout => ($timeout // 7), # cope with a 401 (3s api delay) and high latency cookie_name => 'PBSAuthCookie', ); @@ -724,7 +724,7 @@ sub list_volumes { return $res if !grep { $_ eq 'backup' } @$content_types; my $password = pbs_get_password($scfg, $storeid); - my $conn = pbs_api_connect($scfg, $password); + my $conn = pbs_api_connect($scfg, $password, 120); my $datastore = $scfg->{datastore}; my $param = {}; -- 2.30.2