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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A69FE8DD6C; Thu, 10 Nov 2022 11:36:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 91F872502D; Thu, 10 Nov 2022 11:36:38 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS; Thu, 10 Nov 2022 11:36:35 +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 D75F7439C8; Thu, 10 Nov 2022 11:36:34 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Thu, 10 Nov 2022 11:36:30 +0100 Message-Id: <20221110103634.2177856-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221110103634.2177856-1-d.csapak@proxmox.com> References: <20221110103634.2177856-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.066 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 Subject: [pve-devel] [PATCH common v4 1/2] PBSClient: file_restore_list: add extraParams and use timeout 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: Thu, 10 Nov 2022 10:36:38 -0000 under some conditions, like when calling it in the api where we have a 30s pveproxy limit, we want to make use of the '--timeout' parameter of the file-restore binary, but we may want to call it in the future where we don't want add timeout. To achieve that, add an extendable 'extra_params' hash parameter to 'file_restore_list' and use the timeout from there. Signed-off-by: Dominik Csapak --- changes from v3: * don't hardcode timeout, but use an extra_params hash src/PVE/PBSClient.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index d7dd6e1..ec05a1c 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -375,14 +375,19 @@ sub status { }; sub file_restore_list { - my ($self, $snapshot, $filepath, $base64) = @_; + my ($self, $snapshot, $filepath, $base64, $extra_params) = @_; (my $namespace, $snapshot) = split_namespaced_parameter($self, $snapshot); + my $cmd = [ $snapshot, $filepath, "--base64", $base64 ? 1 : 0]; + + if (my $timeout = $extra_params->{timeout}) { + push $cmd->@*, '--timeout', $timeout; + } return run_client_cmd( $self, "list", - [ $snapshot, $filepath, "--base64", $base64 ? 1 : 0 ], + $cmd, 0, "proxmox-file-restore", $namespace, -- 2.30.2