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 16050B2FB for ; Wed, 9 Aug 2023 11:22:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F11B412AA3 for ; Wed, 9 Aug 2023 11:22:28 +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 for ; Wed, 9 Aug 2023 11:22:28 +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 43FCF43BDD for ; Wed, 9 Aug 2023 11:22:28 +0200 (CEST) From: Philipp Hufnagl To: pve-devel@lists.proxmox.com Date: Wed, 9 Aug 2023 11:22:25 +0200 Message-Id: <20230809092225.39581-3-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230809092225.39581-1-p.hufnagl@proxmox.com> References: <20230809092225.39581-1-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 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 Subject: [pve-devel] [PATCH storage/manager v5 1/1] fix #4849: download-url: allow download and decompression of compressed ISOs 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, 09 Aug 2023 09:22:29 -0000 extend the download_url function with the capabillity to handle compression add decopressor info for images build compression algorithm regex dynamically to avoid duplication Signed-off-by: Philipp Hufnagl --- src/PVE/API2/Storage/Status.pm | 14 +++++++++++++- src/PVE/Storage.pm | 6 ++++++ src/PVE/Storage/Plugin.pm | 3 ++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm index 2aaeff6..7875530 100644 --- a/src/PVE/API2/Storage/Status.pm +++ b/src/PVE/API2/Storage/Status.pm @@ -578,6 +578,12 @@ __PACKAGE__->register_method({ requires => 'checksum-algorithm', optional => 1, }, + compression => { + description => "Decompress the downloaded file using specified compression algorithm", + type => 'string', + enum => $PVE::Storage::Plugin::KNOWN_COMPRESSION_FORMATS, + optional => 1, + }, 'checksum-algorithm' => { description => "The algorithm to calculate the checksum of the file.", type => 'string', @@ -604,7 +610,7 @@ __PACKAGE__->register_method({ my $cfg = PVE::Storage::config(); - my ($node, $storage) = $param->@{'node', 'storage'}; + my ($node, $storage, $compression) = $param->@{'node', 'storage','compression'}; my $scfg = PVE::Storage::storage_check_enabled($cfg, $storage, $node); die "can't upload to storage type '$scfg->{type}', not a file based storage!\n" @@ -649,6 +655,12 @@ __PACKAGE__->register_method({ } my $worker = sub { + if ($compression) { + die "decompression not supported for $content\n" if $content ne 'iso'; + my $info = PVE::Storage::decompressor_info('iso', $compression); + die "no decompression method found\n" if (! $info->{decompressor}); + $opts->{decompression_command} = $info->{decompressor}; + } PVE::Tools::download_file_from_url("$path/$filename", $url, $opts); }; diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index a4d85e1..cb70113 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -1531,6 +1531,12 @@ sub decompressor_info { lzo => ['lzop', '-d', '-c'], zst => ['zstd', '-q', '-d', '-c'], }, + iso => { + # zstd seem to be able to handle .gzip fine. Therefore we dont need additional other tool + gz => ['zcat'], + lzo => ['lzop', '-d', '-c'], + zst => ['zstd', '-q', '-d', '-c'], + }, }; die "ERROR: archive format not defined\n" diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 74d1987..71fcff0 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -19,7 +19,8 @@ use JSON; use base qw(PVE::SectionConfig); -use constant COMPRESSOR_RE => 'gz|lzo|zst'; +use constant KNOWN_COMPRESSION_FORMATS => ( 'gz', 'lzo', 'zst'); +use constant COMPRESSOR_RE => join( '|', KNOWN_COMPRESSION_FORMATS); use constant LOG_EXT => ".log"; use constant NOTES_EXT => ".notes"; -- 2.39.2