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 80E489686 for ; Tue, 26 Apr 2022 12:14:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 74B2319EA1 for ; Tue, 26 Apr 2022 12:14:05 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 65F2319E70 for ; Tue, 26 Apr 2022 12:14:03 +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 3EAFB42BE1 for ; Tue, 26 Apr 2022 12:14:03 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 26 Apr 2022 12:13:59 +0200 Message-Id: <20220426101401.3216096-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220426101401.3216096-1-d.csapak@proxmox.com> References: <20220426101401.3216096-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.127 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pbsclient.pm] Subject: [pve-devel] [PATCH common v2 1/1] PBSClient: file_restore_list: add json-error and timeout parameter 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: Tue, 26 Apr 2022 10:14:35 -0000 we always want the restore_list to use the json-error and timeout here. Set the timeout to 25 seconds so there is a little headroom between this and pveproxys 30s one. Signed-off-by: Dominik Csapak --- src/PVE/PBSClient.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index 21dc363..baedea6 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -343,10 +343,14 @@ sub status { sub file_restore_list { my ($self, $snapshot, $filepath, $base64) = @_; + + my $params = [ $snapshot, $filepath, "--base64", $base64 ? 1 : 0, + '--json-error', 1, '--timeout', 25]; + return run_client_cmd( $self, "list", - [ $snapshot, $filepath, "--base64", $base64 ? 1 : 0 ], + $params, 0, "proxmox-file-restore", ); -- 2.30.2