X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FVZDump%2FQemuServer.pm;h=575abb3a8adea77251815f98ef564797a63e7725;hb=1eb7e5901776b0aee87bb0d49b4201171d175194;hp=6a58a79e30cafad760dc659c2e92465976b2dbed;hpb=e2812738102c2a65dccd0d14ce1be247da8a5ea5;p=qemu-server.git

diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index 6a58a79..575abb3 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -2,18 +2,28 @@ package PVE::VZDump::QemuServer;
 
 use strict;
 use warnings;
-use File::Path;
+
 use File::Basename;
+use File::Path;
+use IO::File;
+use IPC::Open3;
+use JSON;
+
+use PVE::Cluster qw(cfs_read_file);
 use PVE::INotify;
-use PVE::VZDump;
 use PVE::IPCC;
-use PVE::Cluster qw(cfs_read_file);
-use PVE::Tools;
+use PVE::JSONSchema;
+use PVE::QMPClient;
 use PVE::Storage::Plugin;
+use PVE::Storage::PBSPlugin;
 use PVE::Storage;
+use PVE::Tools;
+use PVE::VZDump;
+
+use PVE::QemuConfig;
 use PVE::QemuServer;
-use IO::File;
-use IPC::Open3;
+use PVE::QemuServer::Machine;
+use PVE::QemuServer::Monitor qw(mon_cmd);
 
 use base qw (PVE::VZDump::Plugin);
 
@@ -30,14 +40,12 @@ sub new {
     return $self;
 };
 
-
 sub type {
     return 'qemu';
 }
 
 sub vmlist {
     my ($self) = @_;
-
     return [ keys %{$self->{vmlist}} ];
 }
 
@@ -62,26 +70,34 @@ sub prepare {
 
     my $vollist = [];
     my $drivehash = {};
-    PVE::QemuServer::foreach_drive($conf, sub {
-	my ($ds, $drive) = @_;
-
-	return if PVE::QemuServer::drive_is_cdrom($drive);
+    my $backup_volumes = PVE::QemuConfig->get_backup_volumes($conf);
 
-	my $volid = $drive->{file};
+    foreach my $volume (@{$backup_volumes}) {
+	my $name = $volume->{key};
+	my $volume_config = $volume->{volume_config};
+	my $volid = $volume_config->{file};
 
-	if (defined($drive->{backup}) && !$drive->{backup}) {
-	    $self->loginfo("exclude disk '$ds' '$volid' (backup=no)");
-	    return;
-	} elsif ($drive->{iothread}) {
-	    die "disk '$ds' '$volid' (iothread=on) can't use backup feature currently. Please set backup=no for this drive";
+	if (!$volume->{included}) {
+	    $self->loginfo("exclude disk '$name' '$volid' ($volume->{reason})");
+	    next;
+	} elsif ($self->{vm_was_running} && $volume_config->{iothread}) {
+	    if (!PVE::QemuServer::Machine::runs_at_least_qemu_version($vmid, 4, 0, 1)) {
+		die "disk '$name' '$volid' (iothread=on) can't use backup feature with running QEMU " .
+		    "version < 4.0.1! Either set backup=no for this drive or upgrade QEMU and restart VM\n";
+	    }
 	} else {
-	    $self->loginfo("include disk '$ds' '$volid'");
+	    my $log = "include disk '$name' '$volid'";
+	    if (defined(my $size = $volume_config->{size})) {
+		my $readable_size = PVE::JSONSchema::format_size($size);
+		$log .= " $readable_size";
+	    }
+	    $self->loginfo($log);
 	}
 
 	my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
 	push @$vollist, $volid if $storeid;
-	$drivehash->{$ds} = $drive;
-    });
+	$drivehash->{$name} = $volume->{volume_config};
+    }
 
     PVE::Storage::activate_volumes($self->{storecfg}, $vollist);
 
@@ -89,28 +105,25 @@ sub prepare {
 	my $drive = $drivehash->{$ds};
 
 	my $volid = $drive->{file};
-
-	my $path;
-
 	my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
+
+	my $path = $volid;
 	if ($storeid) {
 	    $path = PVE::Storage::path($self->{storecfg}, $volid);
-	} else {
-	    $path = $volid;
 	}
-
 	next if !$path;
 
-	my $format = undef;
-	my $size = undef;
-
-	eval{
-	    ($size, $format) = PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5);
-	};
+	my ($size, $format) = eval { PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5) };
 	die "no such volume '$volid'\n" if $@;
 
-	my $diskinfo = { path => $path , volid => $volid, storeid => $storeid,
-			 format => $format, virtdev => $ds, qmdevice => "drive-$ds" };
+	my $diskinfo = {
+	    path => $path,
+	    volid => $volid,
+	    storeid => $storeid,
+	    format => $format,
+	    virtdev => $ds,
+	    qmdevice => "drive-$ds",
+	};
 
 	if (-b $path) {
 	    $diskinfo->{type} = 'block';
@@ -133,13 +146,13 @@ sub vm_status {
 sub lock_vm {
     my ($self, $vmid) = @_;
 
-    $self->cmd ("qm set $vmid --lock backup");
+    PVE::QemuConfig->set_lock($vmid, 'backup');
 }
 
 sub unlock_vm {
     my ($self, $vmid) = @_;
 
-    $self->cmd ("qm unlock $vmid");
+    PVE::QemuConfig->remove_lock($vmid, 'backup');
 }
 
 sub stop_vm {
@@ -196,9 +209,7 @@ sub assemble {
 		$found_snapshot = 1;
 	    }
 	}
-
-	next if $found_snapshot; # skip all snapshots data
-	next if $found_pending; # skip all pending changes
+	next if $found_snapshot || $found_pending; # skip all snapshots and pending changes config data
 
 	if ($line =~ m/^unused\d+:\s*(\S+)\s*/) {
 	    $self->loginfo("skip unused drive '$1' (not included into backup)");
@@ -222,7 +233,6 @@ sub assemble {
     if ($found_snapshot) {
 	$self->loginfo("snapshots found (not included into backup)");
     }
-
     if ($found_pending) {
 	$self->loginfo("pending configuration changes found (not included into backup)");
     }
@@ -233,12 +243,397 @@ sub assemble {
 sub archive {
     my ($self, $task, $vmid, $filename, $comp) = @_;
 
+    my $opts = $self->{vzdump}->{opts};
+    my $scfg = $opts->{scfg};
+
+    if ($self->{vzdump}->{opts}->{pbs}) {
+	$self->archive_pbs($task, $vmid);
+    } else {
+	$self->archive_vma($task, $vmid, $filename, $comp);
+    }
+}
+
+# number, [precision=1]
+my $num2str = sub {
+    return sprintf( "%." . ( $_[1] || 1 ) . "f", $_[0] );
+};
+my sub bytes_to_human {
+    my ($bytes, $precission) = @_;
+
+    return $num2str->($bytes, $precission) . ' B' if $bytes < 1024;
+    my $kb = $bytes/1024;
+
+    return $num2str->($kb, $precission) . " KiB" if $kb < 1024;
+    my $mb = $kb/1024;
+
+    return $num2str->($mb, $precission) . " MiB" if $mb < 1024;
+    my $gb = $mb/1024;
+
+    return $num2str->($gb, $precission) . " GiB" if $gb < 1024;
+    my $tb = $gb/1024;
+
+    return $num2str->($tb, $precission) . " TiB";
+}
+my sub duration_to_human {
+    my ($seconds) = @_;
+
+    return sprintf('%2ds', $seconds) if $seconds < 60;
+    my $minutes = $seconds / 60;
+    $seconds = $seconds % 60;
+
+    return sprintf('%2dm %2ds', $minutes, $seconds) if $minutes < 60;
+    my $hours = $minutes / 60;
+    $minutes = $minutes % 60;
+
+    return sprintf('%2dh %2dm %2ds', $hours, $minutes, $seconds) if $hours < 24;
+    my $days = $hours / 24;
+    $hours = $hours % 24;
+
+    return sprintf('%2dd %2dh %2dm', $days, $hours, $minutes);
+}
+
+my $bitmap_action_to_human = sub {
+    my ($self, $info) = @_;
+
+    my $action = $info->{action};
+
+    if ($action eq "not-used") {
+	return "disabled (no support)" if $self->{vm_was_running};
+	return "disabled (VM not running)";
+    } elsif ($action eq "not-used-removed") {
+	return "disabled (old bitmap cleared)";
+    } elsif ($action eq "new") {
+	return "created new";
+    } elsif ($action eq "used") {
+	if ($info->{dirty} == 0) {
+	    return "OK (drive clean)";
+	} else {
+	    my $size = bytes_to_human($info->{size});
+	    my $dirty = bytes_to_human($info->{dirty});
+	    return "OK ($dirty of $size dirty)";
+	}
+    } elsif ($action eq "invalid") {
+	return "existing bitmap was invalid and has been cleared";
+    } else {
+	return "unknown";
+    }
+};
+
+my $query_backup_status_loop = sub {
+    my ($self, $vmid, $job_uuid, $qemu_support) = @_;
+
+    my $starttime = time ();
+    my $last_time = $starttime;
+    my ($last_percent, $last_total, $last_target, $last_zero, $last_transferred) = (-1, 0, 0, 0, 0);
+    my ($transferred, $reused);
+
+    my $get_mbps = sub {
+	my ($mb, $delta) = @_;
+	return "0 B/s" if $mb <= 0;
+	my $bw = int(($mb / $delta));
+	return bytes_to_human($bw) . "/s";
+    };
+
+    my $target = 0;
+    my $last_reused = 0;
+    my $has_query_bitmap = $qemu_support && $qemu_support->{'query-bitmap-info'};
+    my $is_template = PVE::QemuConfig->is_template($self->{vmlist}->{$vmid});
+    if ($has_query_bitmap) {
+	my $total = 0;
+	my $bitmap_info = mon_cmd($vmid, 'query-pbs-bitmap-info');
+	for my $info (sort { $a->{drive} cmp $b->{drive} } @$bitmap_info) {
+	    if (!$is_template) {
+		my $text = $bitmap_action_to_human->($self, $info);
+		my $drive = $info->{drive};
+		$drive =~ s/^drive-//; # for consistency
+		$self->loginfo("$drive: dirty-bitmap status: $text");
+	    }
+	    $target += $info->{dirty};
+	    $total += $info->{size};
+	    $last_reused += $info->{size} - $info->{dirty};
+	}
+	if ($target < $total) {
+	    my $total_h = bytes_to_human($total);
+	    my $target_h = bytes_to_human($target);
+	    $self->loginfo("using fast incremental mode (dirty-bitmap), $target_h dirty of $total_h total");
+	}
+    }
+
+    my $first_round = 1;
+    my $last_finishing = 0;
+    while(1) {
+	my $status = mon_cmd($vmid, 'query-backup');
+
+	my $total = $status->{total} || 0;
+	my $dirty = $status->{dirty};
+	$target = (defined($dirty) && $dirty < $total) ? $dirty : $total if !$has_query_bitmap;
+	$transferred = $status->{transferred} || 0;
+	$reused = $status->{reused};
+	my $percent = $target ? int(($transferred * 100)/$target) : 100;
+	my $zero = $status->{'zero-bytes'} || 0;
+
+	die "got unexpected uuid\n" if !$status->{uuid} || ($status->{uuid} ne $job_uuid);
+
+	my $ctime = time();
+	my $duration = $ctime - $starttime;
+
+	my $rbytes = $transferred - $last_transferred;
+	my $wbytes;
+	if ($reused) {
+	    # reused includes zero bytes for PBS
+	    $wbytes = $rbytes - ($reused - $last_reused);
+	} else {
+	    $wbytes = $rbytes - ($zero - $last_zero);
+	}
+
+	my $timediff = ($ctime - $last_time) || 1; # fixme
+	my $mbps_read = $get_mbps->($rbytes, $timediff);
+	my $mbps_write = $get_mbps->($wbytes, $timediff);
+	my $target_h = bytes_to_human($target);
+	my $transferred_h = bytes_to_human($transferred);
+
+	if (!$has_query_bitmap && $first_round && $target != $total) { # FIXME: remove with PVE 7.0
+	    my $total_h = bytes_to_human($total);
+	    $self->loginfo("using fast incremental mode (dirty-bitmap), $target_h dirty of $total_h total");
+	}
+
+	my $statusline = sprintf("%3d%% ($transferred_h of $target_h) in %s"
+	    .", read: $mbps_read, write: $mbps_write", $percent, duration_to_human($duration));
+
+	my $res = $status->{status} || 'unknown';
+	if ($res ne 'active') {
+	    if ($last_percent < 100) {
+		$self->loginfo($statusline);
+	    }
+	    if ($res ne 'done') {
+		die (($status->{errmsg} || "unknown error") . "\n") if $res eq 'error';
+		die "got unexpected status '$res'\n";
+	    }
+	    $last_target = $target if $target;
+	    $last_total = $total if $total;
+	    $last_zero = $zero if $zero;
+	    $last_transferred = $transferred if $transferred;
+	    last;
+	}
+	if ($percent != $last_percent && ($timediff > 2)) {
+	    $self->loginfo($statusline);
+	    $last_percent = $percent;
+	    $last_target = $target if $target;
+	    $last_total = $total if $total;
+	    $last_zero = $zero if $zero;
+	    $last_transferred = $transferred if $transferred;
+	    $last_time = $ctime;
+	    $last_reused = $reused;
+
+	    if (!$last_finishing && $status->{finishing}) {
+		$self->loginfo("Waiting for server to finish verification...");
+	    }
+	    $last_finishing = $status->{finishing};
+	}
+	sleep(1);
+	$first_round = 0 if $first_round;
+    }
+
+    my $duration = time() - $starttime;
+
+    if ($last_zero) {
+	my $zero_per = $last_target ? int(($last_zero * 100)/$last_target) : 0;
+	my $zero_h = bytes_to_human($last_zero, 2);
+	$self->loginfo("backup is sparse: $zero_h (${zero_per}%) total zero data");
+    }
+    if ($reused) {
+	my $reused_h = bytes_to_human($reused, 2);
+	my $reuse_per = int($reused * 100 / $last_total);
+	$self->loginfo("backup was done incrementally, reused $reused_h (${reuse_per}%)");
+    }
+    if ($transferred) {
+	my $transferred_h = bytes_to_human($transferred, 2);
+	if ($duration) {
+	    my $mbps = $get_mbps->($transferred, $duration);
+	    $self->loginfo("transferred $transferred_h in $duration seconds ($mbps)");
+	} else {
+	    $self->loginfo("transferred $transferred_h in <1 seconds");
+	}
+    }
+
+    return {
+	total => $last_total,
+	reused => $reused,
+    };
+};
+
+sub archive_pbs {
+    my ($self, $task, $vmid) = @_;
+
     my $conffile = "$task->{tmpdir}/qemu-server.conf";
     my $firewall = "$task->{tmpdir}/qemu-server.fw";
 
     my $opts = $self->{vzdump}->{opts};
+    my $scfg = $opts->{scfg};
 
-    my $starttime = time ();
+    my $starttime = time();
+
+    my $server = $scfg->{server};
+    my $datastore = $scfg->{datastore};
+    my $username = $scfg->{username} // 'root@pam';
+    my $fingerprint = $scfg->{fingerprint};
+
+    my $repo = "$username\@$server:$datastore";
+    my $password = PVE::Storage::PBSPlugin::pbs_get_password($scfg, $opts->{storage});
+    my $keyfile = PVE::Storage::PBSPlugin::pbs_encryption_key_file_name($scfg, $opts->{storage});
+
+    my $diskcount = scalar(@{$task->{disks}});
+    # proxmox-backup-client can only handle raw files and block devs
+    # only use it (directly) for disk-less VMs
+    if (!$diskcount) {
+	my @pathlist;
+	$self->loginfo("backup contains no disks");
+
+	local $ENV{PBS_PASSWORD} = $password;
+	local $ENV{PBS_FINGERPRINT} = $fingerprint if defined($fingerprint);
+	my $cmd = [
+	    '/usr/bin/proxmox-backup-client',
+	    'backup',
+	    '--repository', $repo,
+	    '--backup-type', 'vm',
+	    '--backup-id', "$vmid",
+	    '--backup-time', $task->{backup_time},
+	];
+
+	push @$cmd, "qemu-server.conf:$conffile";
+	push @$cmd, "fw.conf:$firewall" if -e $firewall;
+
+	$self->loginfo("starting template backup");
+	$self->loginfo(join(' ', @$cmd));
+
+	$self->cmd($cmd);
+
+	return;
+    }
+
+    # get list early so we die on unkown drive types before doing anything
+    my $devlist = _get_task_devlist($task);
+
+    $self->enforce_vm_running_for_backup($vmid);
+
+    my $backup_job_uuid;
+    eval {
+	$SIG{INT} = $SIG{TERM} = $SIG{QUIT} = $SIG{HUP} = $SIG{PIPE} = sub {
+	    die "interrupted by signal\n";
+	};
+
+	my $qemu_support = eval { mon_cmd($vmid, "query-proxmox-support") };
+	if (!$qemu_support) {
+	    die "PBS backups are not supported by the running QEMU version. Please make "
+	      . "sure you've installed the latest version and the VM has been restarted.\n";
+	}
+
+	my $fs_frozen = $self->qga_fs_freeze($task, $vmid);
+
+	my $params = {
+	    format => "pbs",
+	    'backup-file' => $repo,
+	    'backup-id' => "$vmid",
+	    'backup-time' => $task->{backup_time},
+	    password => $password,
+	    devlist => $devlist,
+	    'config-file' => $conffile,
+	};
+	$params->{speed} = $opts->{bwlimit}*1024 if $opts->{bwlimit};
+	$params->{fingerprint} = $fingerprint if defined($fingerprint);
+	$params->{'firewall-file'} = $firewall if -e $firewall;
+	if (-e $keyfile) {
+	    $self->loginfo("enabling encryption");
+	    $params->{keyfile} = $keyfile;
+	    $params->{encrypt} = JSON::true;
+	} else {
+	    $params->{encrypt} = JSON::false;
+	}
+
+	my $is_template = PVE::QemuConfig->is_template($self->{vmlist}->{$vmid});
+	$params->{'use-dirty-bitmap'} = JSON::true
+	    if $qemu_support->{'pbs-dirty-bitmap'} && $self->{vm_was_running} && !$is_template;
+
+	$params->{timeout} = 60; # give some time to connect to the backup server
+
+	my $res = eval { mon_cmd($vmid, "backup", %$params) };
+	my $qmperr = $@;
+	$backup_job_uuid = $res->{UUID} if $res;
+
+	if ($fs_frozen) {
+	    $self->qga_fs_thaw($vmid);
+	}
+
+	die $qmperr if $qmperr;
+	die "got no uuid for backup task\n" if !defined($backup_job_uuid);
+
+	$self->loginfo("started backup task '$backup_job_uuid'");
+
+	$self->resume_vm_after_job_start($task, $vmid);
+
+	my $stat = $query_backup_status_loop->($self, $vmid, $backup_job_uuid, $qemu_support);
+	$task->{size} = $stat->{total};
+    };
+    my $err = $@;
+    if ($err) {
+	$self->logerr($err);
+	$self->mon_backup_cancel($vmid) if defined($backup_job_uuid);
+    }
+    $self->restore_vm_power_state($vmid);
+
+    die $err if $err;
+}
+
+my $fork_compressor_pipe = sub {
+    my ($self, $comp, $outfileno) = @_;
+
+    my @pipefd = POSIX::pipe();
+    my $cpid = fork();
+    die "unable to fork worker - $!" if !defined($cpid) || $cpid < 0;
+    if ($cpid == 0) {
+	eval {
+	    POSIX::close($pipefd[1]);
+	    # redirect STDIN
+	    my $fd = fileno(STDIN);
+	    close STDIN;
+	    POSIX::close(0) if $fd != 0;
+	    die "unable to redirect STDIN - $!"
+		if !open(STDIN, "<&", $pipefd[0]);
+
+	    # redirect STDOUT
+	    $fd = fileno(STDOUT);
+	    close STDOUT;
+	    POSIX::close (1) if $fd != 1;
+
+	    die "unable to redirect STDOUT - $!"
+		if !open(STDOUT, ">&", $outfileno);
+
+	    exec($comp);
+	    die "fork compressor '$comp' failed\n";
+	};
+	if (my $err = $@) {
+	    $self->logerr($err);
+	    POSIX::_exit(1);
+	}
+	POSIX::_exit(0);
+	kill(-9, $$);
+    } else {
+	POSIX::close($pipefd[0]);
+	$outfileno = $pipefd[1];
+    }
+
+    return ($cpid, $outfileno);
+};
+
+sub archive_vma {
+    my ($self, $task, $vmid, $filename, $comp) = @_;
+
+    my $conffile = "$task->{tmpdir}/qemu-server.conf";
+    my $firewall = "$task->{tmpdir}/qemu-server.fw";
+
+    my $opts = $self->{vzdump}->{opts};
+
+    my $starttime = time();
 
     my $speed = 0;
     if ($opts->{bwlimit}) {
@@ -246,7 +641,6 @@ sub archive {
     }
 
     my $diskcount = scalar(@{$task->{disks}});
-
     if (PVE::QemuConfig->is_template($self->{vmlist}->{$vmid}) || !$diskcount) {
 	my @pathlist;
 	foreach my $di (@{$task->{disks}}) {
@@ -268,7 +662,7 @@ sub archive {
 	    $outcmd = "exec:cat";
 	}
 
-	$outcmd .= ">$filename" if !$opts->{stdout};
+	$outcmd .= " > $filename" if !$opts->{stdout};
 
 	my $cmd = ['/usr/bin/vma', 'create', '-v', '-c', $conffile];
 	push @$cmd, '-c', $firewall if -e $firewall;
@@ -278,7 +672,7 @@ sub archive {
 	$self->loginfo(join(' ', @$cmd));
 
 	if ($opts->{stdout}) {
-	    $self->cmd($cmd, output => ">&=" . fileno($opts->{stdout}));
+	    $self->cmd($cmd, output => ">&" . fileno($opts->{stdout}));
 	} else {
 	    $self->cmd($cmd);
 	}
@@ -286,51 +680,16 @@ sub archive {
 	return;
     }
 
+    my $devlist = _get_task_devlist($task);
 
-    my $devlist = '';
-    foreach my $di (@{$task->{disks}}) {
-	if ($di->{type} eq 'block' || $di->{type} eq 'file') {
-	    $devlist .= $devlist ? ",$di->{qmdevice}" : $di->{qmdevice};
-	} else {
-	    die "implement me";
-	}
-    }
-
-    my $stop_after_backup;
-    my $resume_on_backup;
-
-    my $skiplock = 1;
-    my $vm_is_running = PVE::QemuServer::check_running($vmid);
-    if (!$vm_is_running) {
-	eval {
-	    $self->loginfo("starting kvm to execute backup task");
-	    PVE::QemuServer::vm_start($self->{storecfg}, $vmid, undef,
-				      $skiplock, undef, 1);
-	    if ($self->{vm_was_running}) {
-		$resume_on_backup = 1;
-	    } else {
-		$stop_after_backup = 1;
-	    }
-	};
-	if (my $err = $@) {
-	    die $err;
-	}
-    }
+    $self->enforce_vm_running_for_backup($vmid);
 
     my $cpid;
-    my $interrupt_msg = "interrupted by signal\n";
+    my $backup_job_uuid;
+
     eval {
 	$SIG{INT} = $SIG{TERM} = $SIG{QUIT} = $SIG{HUP} = $SIG{PIPE} = sub {
-	    die $interrupt_msg;
-	};
-
-	my $qmpclient = PVE::QMPClient->new();
-
-	my $uuid;
-
-	my $backup_cb = sub {
-	    my ($vmid, $resp) = @_;
-	    $uuid = $resp->{return}->{UUID};
+	    die "interrupted by signal\n";
 	};
 
 	my $outfh;
@@ -340,48 +699,18 @@ sub archive {
 	    $outfh = IO::File->new($filename, "w") ||
 		die "unable to open file '$filename' - $!\n";
 	}
+	my $outfileno = fileno($outfh);
 
-	my $outfileno;
 	if ($comp) {
-	    my @pipefd = POSIX::pipe();
-	    $cpid = fork();
-	    die "unable to fork worker - $!" if !defined($cpid);
-	    if ($cpid == 0) {
-		eval {
-		    POSIX::close($pipefd[1]);
-		    # redirect STDIN
-		    my $fd = fileno(STDIN);
-		    close STDIN;
-		    POSIX::close(0) if $fd != 0;
-		    die "unable to redirect STDIN - $!"
-			if !open(STDIN, "<&", $pipefd[0]);
-
-		    # redirect STDOUT
-		    $fd = fileno(STDOUT);
-		    close STDOUT;
-		    POSIX::close (1) if $fd != 1;
-
-		    die "unable to redirect STDOUT - $!"
-			if !open(STDOUT, ">&", fileno($outfh));
-
-		    exec($comp);
-		    die "fork compressor '$comp' failed\n";
-		};
-		if (my $err = $@) {
-		    $self->logerr($err);
-		    POSIX::_exit(1);
-		}
-		POSIX::_exit(0);
-		kill(-9, $$);
-	    } else {
-		POSIX::close($pipefd[0]);
-		$outfileno = $pipefd[1];
-	    }
-	} else {
-	    $outfileno = fileno($outfh);
+	    ($cpid, $outfileno) = $fork_compressor_pipe->($self, $comp, $outfileno);
 	}
 
- 	my $add_fd_cb = sub {
+	my $qmpclient = PVE::QMPClient->new();
+	my $backup_cb = sub {
+	    my ($vmid, $resp) = @_;
+	    $backup_job_uuid = $resp->{return}->{UUID};
+	};
+	my $add_fd_cb = sub {
 	    my ($vmid, $resp) = @_;
 
 	    my $params = {
@@ -390,29 +719,23 @@ sub archive {
 		'config-file' => $conffile,
 		devlist => $devlist
 	    };
-	    
 	    $params->{'firewall-file'} = $firewall if -e $firewall;
+
 	    $qmpclient->queue_cmd($vmid, $backup_cb, 'backup', %$params);
 	};
 
-	$qmpclient->queue_cmd($vmid, $add_fd_cb, 'getfd',
-			      fd => $outfileno, fdname => "backup");
+	$qmpclient->queue_cmd($vmid, $add_fd_cb, 'getfd', fd => $outfileno, fdname => "backup");
 
-	if ($self->{vmlist}->{$vmid}->{agent} && $vm_is_running){
-	    eval { PVE::QemuServer::vm_mon_cmd($vmid, "guest-fsfreeze-freeze"); };
-	    if (my $err = $@) {
-		$self->logerr($err);
-	    }
-	}
+	my $fs_frozen = $self->qga_fs_freeze($task, $vmid);
 
-	$qmpclient->queue_execute();
+	eval { $qmpclient->queue_execute(30) };
+	my $qmperr = $@;
 
-	if ($self->{vmlist}->{$vmid}->{agent} && $vm_is_running ){
-	    eval { PVE::QemuServer::vm_mon_cmd($vmid, "guest-fsfreeze-thaw"); };
-	    if (my $err = $@) {
-		$self->logerr($err);
-	    }
+	if ($fs_frozen) {
+	    $self->qga_fs_thaw($vmid);
 	}
+
+	die $qmperr if $qmperr;
 	die $qmpclient->{errors}->{$vmid} if $qmpclient->{errors}->{$vmid};
 
 	if ($cpid) {
@@ -420,104 +743,21 @@ sub archive {
 		die "close output file handle failed\n";
 	}
 
-	die "got no uuid for backup task\n" if !$uuid;
-
-	$self->loginfo("started backup task '$uuid'");
+	die "got no uuid for backup task\n" if !defined($backup_job_uuid);
 
-	if ($resume_on_backup) {
-	    $self->loginfo("resume VM");
-	    PVE::QemuServer::vm_mon_cmd($vmid, 'cont');
-	}
+	$self->loginfo("started backup task '$backup_job_uuid'");
 
-	my $status;
-	my $starttime = time ();
-	my $last_per = -1;
-	my $last_total = 0;
-	my $last_zero = 0;
-	my $last_transferred = 0;
-	my $last_time = time();
-	my $transferred;
-
-	while(1) {
-	    $status = PVE::QemuServer::vm_mon_cmd($vmid, 'query-backup');
-	    my $total = $status->{total} || 0;
-	    $transferred = $status->{transferred} || 0;
-	    my $per = $total ? int(($transferred * 100)/$total) : 0;
-	    my $zero = $status->{'zero-bytes'} || 0;
-	    my $zero_per = $total ? int(($zero * 100)/$total) : 0;
-
-	    die "got unexpected uuid\n" if !$status->{uuid} || ($status->{uuid} ne $uuid);
-
-	    my $ctime = time();
-	    my $duration = $ctime - $starttime;
-
-	    my $rbytes = $transferred - $last_transferred;
-	    my $wbytes = $rbytes - ($zero - $last_zero);
-
-	    my $timediff = ($ctime - $last_time) || 1; # fixme
-	    my $mbps_read = ($rbytes > 0) ?
-		int(($rbytes/$timediff)/(1000*1000)) : 0;
-	    my $mbps_write = ($wbytes > 0) ?
-		int(($wbytes/$timediff)/(1000*1000)) : 0;
-
-	    my $statusline = "status: $per% ($transferred/$total), " .
-		"sparse ${zero_per}% ($zero), duration $duration, " .
-		"$mbps_read/$mbps_write MB/s";
-	    my $res = $status->{status} || 'unknown';
-	    if ($res ne 'active') {
-		$self->loginfo($statusline);
-		die(($status->{errmsg} || "unknown error") . "\n")
-		    if $res eq 'error';
-		die "got unexpected status '$res'\n"
-		    if $res ne 'done';
-		die "got wrong number of transfered bytes ($total != $transferred)\n"
-		    if ($res eq 'done') && ($total != $transferred);
-
-		last;
-	    }
-	    if ($per != $last_per && ($timediff > 2)) {
-		$self->loginfo($statusline);
-		$last_per = $per;
-		$last_total = $total if $total;
-		$last_zero = $zero if $zero;
-		$last_transferred = $transferred if $transferred;
-		$last_time = $ctime;
-	    }
-	    sleep(1);
-	}
+	$self->resume_vm_after_job_start($task, $vmid);
 
-	my $duration = time() - $starttime;
-	if ($transferred && $duration) {
-	    my $mb = int($transferred/(1000*1000));
-	    my $mbps = int(($transferred/$duration)/(1000*1000));
-	    $self->loginfo("transferred $mb MB in $duration seconds ($mbps MB/s)");
-	}
+	$query_backup_status_loop->($self, $vmid, $backup_job_uuid);
     };
     my $err = $@;
-
     if ($err) {
 	$self->logerr($err);
-	$self->loginfo("aborting backup job");
-	eval { PVE::QemuServer::vm_mon_cmd($vmid, 'backup-cancel'); };
-	if (my $err1 = $@) {
-	    $self->logerr($err1);
-	}
+	$self->mon_backup_cancel($vmid) if defined($backup_job_uuid);
     }
 
-    if ($stop_after_backup) {
-	# stop if not running
-	eval {
-	    my $resp = PVE::QemuServer::vm_mon_cmd($vmid, 'query-status');
-	    my $status = $resp && $resp->{status} ?  $resp->{status} : 'unknown';
-	    if ($status eq 'prelaunch') {
-		$self->loginfo("stopping kvm after backup task");
-		PVE::QemuServer::vm_stop($self->{storecfg}, $vmid, $skiplock);
-	    } else {
-		$self->loginfo("kvm status changed after backup ('$status')" .
-			       " - keep VM running");
-	    }
-	}
-    }
+    $self->restore_vm_power_state($vmid);
 
     if ($err) {
 	if ($cpid) {
@@ -538,6 +778,113 @@ sub archive {
     }
 }
 
+sub _get_task_devlist {
+    my ($task) = @_;
+
+    my $devlist = '';
+    foreach my $di (@{$task->{disks}}) {
+	if ($di->{type} eq 'block' || $di->{type} eq 'file') {
+	    $devlist .= ',' if $devlist;
+	    $devlist .= $di->{qmdevice};
+	} else {
+	    die "implement me (type '$di->{type}')";
+	}
+    }
+    return $devlist;
+}
+
+sub qga_fs_freeze {
+    my ($self, $task, $vmid) = @_;
+    return if !$self->{vmlist}->{$vmid}->{agent} || $task->{mode} eq 'stop' || !$self->{vm_was_running};
+
+    if (!PVE::QemuServer::qga_check_running($vmid, 1)) {
+	$self->loginfo("skipping guest-agent 'fs-freeze', agent configured but not running?");
+	return;
+    }
+
+    $self->loginfo("issuing guest-agent 'fs-freeze' command");
+    eval { mon_cmd($vmid, "guest-fsfreeze-freeze") };
+    $self->logerr($@) if $@;
+
+    return 1; # even on mon command error, ensure we always thaw again
+}
+
+# only call if fs_freeze return 1
+sub qga_fs_thaw {
+    my ($self, $vmid) = @_;
+
+    $self->loginfo("issuing guest-agent 'fs-thaw' command");
+    eval { mon_cmd($vmid, "guest-fsfreeze-thaw") };
+    $self->logerr($@) if $@;
+}
+
+# we need a running QEMU/KVM process for backup, starts a paused (prelaunch)
+# one if VM isn't already running
+sub enforce_vm_running_for_backup {
+    my ($self, $vmid) = @_;
+
+    if (PVE::QemuServer::check_running($vmid)) {
+	$self->{vm_was_running} = 1;
+	return;
+    }
+
+    eval {
+	$self->loginfo("starting kvm to execute backup task");
+	# start with skiplock
+	my $params = {
+	    skiplock => 1,
+	    skiptemplate => 1,
+	    paused => 1,
+	};
+	PVE::QemuServer::vm_start($self->{storecfg}, $vmid, $params);
+    };
+    die $@ if $@;
+}
+
+# resume VM againe once we got in a clear state (stop mode backup of running VM)
+sub resume_vm_after_job_start {
+    my ($self, $task, $vmid) = @_;
+
+    return if !$self->{vm_was_running};
+
+    if (my $stoptime = $task->{vmstoptime}) {
+	my $delay = time() - $task->{vmstoptime};
+	$task->{vmstoptime} = undef; # avoid printing 'online after ..' twice
+	$self->loginfo("resuming VM again after $delay seconds");
+    } else {
+	$self->loginfo("resuming VM again");
+    }
+    mon_cmd($vmid, 'cont');
+}
+
+# stop again if VM was not running before
+sub restore_vm_power_state {
+    my ($self, $vmid) = @_;
+
+    # we always let VMs keep running
+    return if $self->{vm_was_running};
+
+    eval {
+	my $resp = mon_cmd($vmid, 'query-status');
+	my $status = $resp && $resp->{status} ?  $resp->{status} : 'unknown';
+	if ($status eq 'prelaunch') {
+	    $self->loginfo("stopping kvm after backup task");
+	    PVE::QemuServer::vm_stop($self->{storecfg}, $vmid, 1);
+	} else {
+	    $self->loginfo("kvm status changed after backup ('$status') - keep VM running");
+	}
+    };
+    warn $@ if $@;
+}
+
+sub mon_backup_cancel {
+    my ($self, $vmid) = @_;
+
+    $self->loginfo("aborting backup job");
+    eval { mon_cmd($vmid, 'backup-cancel') };
+    $self->logerr($@) if $@;
+}
+
 sub snapshot {
     my ($self, $task, $vmid) = @_;