From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 18D541FF168 for ; Tue, 26 Nov 2024 16:23:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B043B58AF; Tue, 26 Nov 2024 16:23:44 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Tue, 26 Nov 2024 16:23:22 +0100 Message-Id: <20241126152325.113926-5-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241126152325.113926-1-f.schauer@proxmox.com> References: <20241126152325.113926-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.027 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 v5 4/7] storage: introduce decompress_archive_into_pipe helper 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Extract the file decompression code into its own reusable subroutine. Signed-off-by: Filip Schauer --- src/PVE/Storage.pm | 64 +++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index ae190cd..5d25a2a 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -1707,6 +1707,45 @@ sub extract_vzdump_config_tar { return wantarray ? ($raw, $file) : $raw; } +sub decompress_archive_into_pipe { + my ($archive, $cmd, $outfunc) = @_; + + my $info = archive_info($archive); + die "archive is not compressed\n" if !$info->{compression}; + my $decompressor = $info->{decompressor}; + my $full_cmd = [ [@$decompressor, $archive], $cmd ]; + + # lzop/zcat exits with 1 when the pipe is closed early, + # detect this and ignore the exit code later + my $broken_pipe; + my $errstring; + my $err = sub { + my $output = shift; + if ( + $output =~ m/lzop: Broken pipe: / + || $output =~ m/gzip: stdout: Broken pipe/ + || $output =~ m/zstd: error 70 : Write error.*Broken pipe/ + ) { + $broken_pipe = 1; + } elsif (!defined ($errstring) && $output !~ m/^\s*$/) { + $errstring = "failed to decompress archive: $output\n"; + } + }; + + my $rc = eval { run_command($full_cmd, outfunc => $outfunc, errfunc => $err, noerr => 1) }; + my $rerr = $@; + + $broken_pipe ||= $rc == 141; # broken pipe from cmd POV + + if (!$errstring && !$broken_pipe && $rc != 0) { + die "$rerr\n" if $rerr; + die "archive decompression failed with exit code $rc\n"; + } + die "$errstring\n" if $errstring; + + return; +} + sub extract_vzdump_config_vma { my ($archive, $comp) = @_; @@ -1718,30 +1757,7 @@ sub extract_vzdump_config_vma { my $decompressor = $info->{decompressor}; if ($comp) { - my $cmd = [ [@$decompressor, $archive], ["vma", "config", "-"] ]; - - # lzop/zcat exits with 1 when the pipe is closed early by vma, detect this and ignore the exit code later - my $broken_pipe; - my $errstring; - my $err = sub { - my $output = shift; - if ($output =~ m/lzop: Broken pipe: / || $output =~ m/gzip: stdout: Broken pipe/ || $output =~ m/zstd: error 70 : Write error.*Broken pipe/) { - $broken_pipe = 1; - } elsif (!defined ($errstring) && $output !~ m/^\s*$/) { - $errstring = "Failed to extract config from VMA archive: $output\n"; - } - }; - - my $rc = eval { run_command($cmd, outfunc => $out, errfunc => $err, noerr => 1) }; - my $rerr = $@; - - $broken_pipe ||= $rc == 141; # broken pipe from vma POV - - if (!$errstring && !$broken_pipe && $rc != 0) { - die "$rerr\n" if $rerr; - die "config extraction failed with exit code $rc\n"; - } - die "$errstring\n" if $errstring; + decompress_archive_into_pipe($archive, ["vma", "config", "-"], $out); } else { run_command(["vma", "config", $archive], outfunc => $out); } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel