From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 111121FF15E
for <inbox@lore.proxmox.com>; Fri, 20 Sep 2024 16:28:21 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B2CA137776;
Fri, 20 Sep 2024 16:28:30 +0200 (CEST)
Message-ID: <d45510c4-098c-4f79-af12-bf234cf5a16e@proxmox.com>
Date: Fri, 20 Sep 2024 16:27:58 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
From: Daniel Kral <d.kral@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Filip Schauer <f.schauer@proxmox.com>
References: <20240918144953.130780-1-f.schauer@proxmox.com>
<20240918144953.130780-5-f.schauer@proxmox.com>
Content-Language: en-US
In-Reply-To: <20240918144953.130780-5-f.schauer@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.003 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: Re: [pve-devel] [PATCH v4 storage 4/6] 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
On 9/18/24 16:49, Filip Schauer wrote:
> Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
Great cleanup! It would only be helpful to have a little more context
information what has been done here. As far as I can tell, there are no
functional changes (except that the newly introduced subroutine will die
in case of an uncompressed archive) but just making the code more
readable and adhere to the Perl Style Guide.
> ---
> 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 12f7b3f..e5f5326 100755
> --- a/src/PVE/Storage.pm
> +++ b/src/PVE/Storage.pm
> @@ -1682,6 +1682,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: <stdout>/
> + || $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) = @_;
>
> @@ -1693,30 +1732,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: <stdout>/ || $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);
> }
Reviewed-by: Daniel Kral <d.kral@proxmox.com>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel