proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-04 18:46:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

enable piped input with qmrestore

Browse Source
This commit is contained in:
Dietmar Maurer 2011-10-19 11:27:42 +02:00
parent 58dc808de2
commit 9c502e26f3
3 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Qemu.pm
View File

@ -146,8 +146,6 @@ __PACKAGE__->register_method({
raise_param_exc({ archive => "option conflicts with other options ($keystr)"}) if $keystr; raise_param_exc({ archive => "option conflicts with other options ($keystr)"}) if $keystr;
} }
# fixme: archive eq '-' (read from stdin)
my $restorefn = sub { my $restorefn = sub {
if (-f $filename) { if (-f $filename) {

45
PVE/QemuServer.pm
View File

@ -1363,7 +1363,7 @@ sub destroy_vm {
}); });
if ($keep_empty_config) { if ($keep_empty_config) {
PVE::Tools::file_set_contents($conffile, "mem: 128\n"); PVE::Tools::file_set_contents($conffile, "memory: 128\n");
} else { } else {
unlink $conffile; unlink $conffile;
} }
@ -2969,12 +2969,36 @@ sub restore_cleanup {
} }
} }
sub shellquote {
my $str = shift;
return "''" if !defined ($str) || ($str eq '');
die "unable to quote string containing null (\\000) bytes"
if $str =~ m/\x00/;
# from String::ShellQuote
if ($str =~ m|[^\w!%+,\-./:@^]|) {
# ' -> '\''
$str =~ s/'/'\\''/g;
$str = "'$str'";
$str =~ s/^''//;
$str =~ s/''$//;
}
return $str;
}
sub restore_archive { sub restore_archive {
my ($archive, $vmid, $opts) = @_; my ($archive, $vmid, $opts) = @_;
my $firstfile = archive_read_firstfile($archive); if ($archive ne '-') {
die "ERROR: file '$archive' dos not lock like a QemuServer vzdump backup\n" my $firstfile = archive_read_firstfile($archive);
if $firstfile ne 'qemu-server.conf'; die "ERROR: file '$archive' dos not lock like a QemuServer vzdump backup\n"
if $firstfile ne 'qemu-server.conf';
}
my $tocmd = "/usr/lib/qemu-server/qmextract"; my $tocmd = "/usr/lib/qemu-server/qmextract";
@ -2982,7 +3006,10 @@ sub restore_archive {
$tocmd .= ' --prealloc' if $opts->{prealloc}; $tocmd .= ' --prealloc' if $opts->{prealloc};
$tocmd .= ' --info' if $opts->{info}; $tocmd .= ' --info' if $opts->{info};
my $cmd = ['tar', 'xf', $archive, '--to-command', $tocmd]; # tar option "xf" does not autodetect compression when read fron STDIN,
# so we pipe to zcat
my $cmd = "zcat -f|tar xf " . shellquote($archive) . " --to-command" .
shellquote($tocmd);
my $tmpdir = "/var/tmp/vzdumptmp$$"; my $tmpdir = "/var/tmp/vzdumptmp$$";
mkpath $tmpdir; mkpath $tmpdir;
@ -3004,7 +3031,13 @@ sub restore_archive {
die "interrupted by signal\n"; die "interrupted by signal\n";
}; };
PVE::Tools::run_command($cmd); if ($archive eq '-') {
print "extracting archive from STDIN\n";
run_command($cmd, input => "<&STDIN");
} else {
print "extracting archive '$archive'\n";
run_command($cmd);
}
return if $opts->{info}; return if $opts->{info};

17
PVE/VZDump/QemuServer.pm
View File

@ -393,8 +393,6 @@ sub archive {
my $fh; my $fh;
my $bwl = $opts->{bwlimit}*1024; # bandwidth limit for cstream
my @filea = ($conffile, 'qemu-server.conf'); # always first file in tar my @filea = ($conffile, 'qemu-server.conf'); # always first file in tar
foreach my $di (@{$task->{disks}}) { foreach my $di (@{$task->{disks}}) {
if ($di->{type} eq 'block' || $di->{type} eq 'file') { if ($di->{type} eq 'block' || $di->{type} eq 'file') {
@ -404,13 +402,18 @@ sub archive {
} }
} }
my $out = ">$filename";
$out = "|cstream -t $bwl $out" if $opts->{bwlimit};
$out = "|gzip $out" if $opts->{compress};
my $files = join (' ', map { "'$_'" } @filea); my $files = join (' ', map { "'$_'" } @filea);
$self->cmd("/usr/lib/qemu-server/vmtar $files $out"); my $cmd = "/usr/lib/qemu-server/vmtar $files";
my $bwl = $opts->{bwlimit}*1024; # bandwidth limit for cstream
$cmd .= "|cstream -t $bwl" if $opts->{bwlimit};
$cmd .= "|gzip" if $opts->{compress};
if ($opts->{stdout}) {
$self->cmd ($cmd, output => ">&=" . fileno($opts->{stdout}));
} else {
$self->cmd ("$cmd >$filename");
}
} }
sub cleanup { sub cleanup {