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 C3C7B8DDFE; Thu, 10 Nov 2022 11:37:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9E91825030; 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 1FDF74450C; Thu, 10 Nov 2022 11:36:35 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Thu, 10 Nov 2022 11:36:31 +0100 Message-Id: <20221110103634.2177856-4-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 2/2] PBSClient: add optional 'dynamic-memory' parameter to file-restore commands 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:37:08 -0000 so that we can make use of the dynamic memory feature of file-restore (it automatically increases the memory of the file-restore vm when we detect a zfs path) Signed-off-by: Dominik Csapak --- new in v4 depends on the proxmox-backup patch for file-restore src/PVE/PBSClient.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index ec05a1c..13b28c1 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -383,6 +383,9 @@ sub file_restore_list { if (my $timeout = $extra_params->{timeout}) { push $cmd->@*, '--timeout', $timeout; } + if (my $dynamic_memory = $extra_params->{'dynamic-memory'}) { + push $cmd->@*, '--dynamic-memory', $dynamic_memory; + } return run_client_cmd( $self, @@ -416,10 +419,16 @@ sub file_restore_extract_prepare { # this blocks while data is transfered, call this from a background worker sub file_restore_extract { - my ($self, $output_file, $snapshot, $filepath, $base64) = @_; + my ($self, $output_file, $snapshot, $filepath, $base64, $extra_params) = @_; (my $namespace, $snapshot) = split_namespaced_parameter($self, $snapshot); + my $cmd = [ $snapshot, $filepath, "-", "--base64", $base64 ? 1 : 0 ]; + + if (my $dynamic_memory = $extra_params->{'dynamic-memory'}) { + push $cmd->@*, '--dynamic-memory', $dynamic_memory; + } + my $ret = eval { local $SIG{ALRM} = sub { die "got timeout\n" }; alarm(30); @@ -433,7 +442,7 @@ sub file_restore_extract { return run_raw_client_cmd( $self, "extract", - [ $snapshot, $filepath, "-", "--base64", $base64 ? 1 : 0 ], + $cmd, binary => "proxmox-file-restore", namespace => $namespace, errfunc => $errfunc, -- 2.30.2