[pve-devel] [PATCH storage v8 7/9] storage: introduce decompress_archive_into_pipe helper

[Filip Schauer <f.schauer@proxmox.com>]

Extract the file decompression code into its own reusable subroutine.

Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
---
 src/PVE/Storage.pm | 68 +++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm
index d380160..5071475 100755
--- a/src/PVE/Storage.pm
+++ b/src/PVE/Storage.pm
@@ -1887,6 +1887,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) = @_;
 
@@ -1898,34 +1937,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);
     }
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel