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

diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index 14778f4..575abb3 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -2,24 +2,37 @@ package PVE::VZDump::QemuServer;
 
 use strict;
 use warnings;
-use File::Path;
+
 use File::Basename;
-use PVE::INotify;
-use PVE::VZDump;
+use File::Path;
+use IO::File;
+use IPC::Open3;
+use JSON;
+
 use PVE::Cluster qw(cfs_read_file);
-use PVE::Tools;
+use PVE::INotify;
+use PVE::IPCC;
+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 PVE::QemuServer::Machine;
+use PVE::QemuServer::Monitor qw(mon_cmd);
 
 use base qw (PVE::VZDump::Plugin);
 
 sub new {
     my ($class, $vzdump) = @_;
-    
+
     PVE::VZDump::check_bin('qm');
 
-    my $self = bless { vzdump => $vzdump };
+    my $self = bless { vzdump => $vzdump }, $class;
 
     $self->{vmlist} = PVE::QemuServer::vzlist();
     $self->{storecfg} = PVE::Storage::config();
@@ -27,14 +40,12 @@ sub new {
     return $self;
 };
 
-
 sub type {
     return 'qemu';
 }
 
 sub vmlist {
     my ($self) = @_;
-
     return [ keys %{$self->{vmlist}} ];
 }
 
@@ -43,147 +54,105 @@ sub prepare {
 
     $task->{disks} = [];
 
-    my $conf = $self->{vmlist}->{$vmid} = PVE::QemuServer::load_config($vmid);
+    my $conf = $self->{vmlist}->{$vmid} = PVE::QemuConfig->load_config($vmid);
+
+    $self->loginfo("VM Name: $conf->{name}")
+	if defined($conf->{name});
+
+    $self->{vm_was_running} = 1;
+    if (!PVE::QemuServer::check_running($vmid)) {
+	$self->{vm_was_running} = 0;
+    }
 
     $task->{hostname} = $conf->{name};
 
-    my $lvmmap = PVE::VZDump::get_lvm_mapping();
+    my $hostname = PVE::INotify::nodename();
 
-    my $hostname = PVE::INotify::nodename(); 
+    my $vollist = [];
+    my $drivehash = {};
+    my $backup_volumes = PVE::QemuConfig->get_backup_volumes($conf);
 
-    my $ind = {};
-    my $mountinfo = {};
-    my $mountind = 0;
+    foreach my $volume (@{$backup_volumes}) {
+	my $name = $volume->{key};
+	my $volume_config = $volume->{volume_config};
+	my $volid = $volume_config->{file};
 
-    my $snapshot_count = 0;
+	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 {
+	    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);
+	}
 
-    PVE::QemuServer::foreach_drive($conf, sub {
-	my ($ds, $drive) = @_;
+	my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
+	push @$vollist, $volid if $storeid;
+	$drivehash->{$name} = $volume->{volume_config};
+    }
 
-	return if PVE::QemuServer::drive_is_cdrom ($drive);
+    PVE::Storage::activate_volumes($self->{storecfg}, $vollist);
 
-	if (defined($drive->{backup}) && $drive->{backup} eq "no") {
-	    $self->loginfo("exclude disk '$ds' (backup=no)");
-	    return;
-	}	   
- 
-	my $volid = $drive->{file};
+    foreach my $ds (sort keys %$drivehash) {
+	my $drive = $drivehash->{$ds};
 
-	my $path;
+	my $volid = $drive->{file};
+	my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
 
-	my ($storeid, $volname) = PVE::Storage::parse_volume_id ($volid, 1);
+	my $path = $volid;
 	if ($storeid) {
-	    PVE::Storage::activate_storage ($self->{storecfg}, $storeid);
-	    $path = PVE::Storage::path ($self->{storecfg}, $volid);
-	} else {
-	    $path = $volid;
+	    $path = PVE::Storage::path($self->{storecfg}, $volid);
 	}
-
-	return if !$path;
-
-	die "no such volume '$volid'\n" if ! -e $path;
-
-	my $diskinfo = { path => $path , volid => $volid, storeid => $storeid, 
-			 snappath => $path, virtdev => $ds };
+	next if !$path;
+
+	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",
+	};
 
 	if (-b $path) {
-
 	    $diskinfo->{type} = 'block';
-
-	    $diskinfo->{filename} = "vm-disk-$ds.raw";
-
-	    if ($mode eq 'snapshot') {
-		my ($lvmvg, $lvmlv) = @{$lvmmap->{$path}} if defined ($lvmmap->{$path});
-		die ("mode failure - unable to detect lvm volume group\n") if !$lvmvg;
-
-		$ind->{$lvmvg} = 0 if !defined $ind->{$lvmvg};
-		$diskinfo->{snapname} = "vzsnap-$hostname-$ind->{$lvmvg}";
-		$diskinfo->{snapdev} = "/dev/$lvmvg/$diskinfo->{snapname}";
-		$diskinfo->{lvmvg} = $lvmvg;
-		$diskinfo->{lvmlv} = $lvmlv;
-		$diskinfo->{snappath} = $diskinfo->{snapdev};
-		$ind->{$lvmvg}++;
-
-		$snapshot_count++;
-	    }
-
 	} else {
-
 	    $diskinfo->{type} = 'file';
-
-	    my (undef, $dir, $ext) = fileparse ($path, qr/\.[^.]*/);
-
-	    $diskinfo->{filename} = "vm-disk-$ds$ext";
-
-	    if ($mode eq 'snapshot') {
-	    
-		my ($srcdev, $lvmpath, $lvmvg, $lvmlv, $fstype) =
-		    PVE::VZDump::get_lvm_device ($dir, $lvmmap);
-
-		my $targetdev = PVE::VZDump::get_lvm_device ($task->{dumpdir}, $lvmmap);
-
-		die ("mode failure - unable to detect lvm volume group\n") if !$lvmvg;
-		die ("mode failure - wrong lvm mount point '$lvmpath'\n") if $dir !~ m|/?$lvmpath/?|;
-		die ("mode failure - unable to dump into snapshot (use option --dumpdir)\n") 
-		    if $targetdev eq $srcdev;
-		
-		$ind->{$lvmvg} = 0 if !defined $ind->{$lvmvg};
-		    
-		my $info = $mountinfo->{$lvmpath};
-		if (!$info) {
-		    my $snapname = "vzsnap-$hostname-$ind->{$lvmvg}";
-		    my $snapdev = "/dev/$lvmvg/$snapname";
-		    $mountinfo->{$lvmpath} = $info = {
-			snapdev => $snapdev,
-			snapname => $snapname,
-			mountpoint => "/mnt/vzsnap$mountind",
-		    };
-		    $ind->{$lvmvg}++;
-		    $mountind++;
-
-		    $snapshot_count++;
-		} 
-
-		$diskinfo->{snapdev} = $info->{snapdev};
-		$diskinfo->{snapname} = $info->{snapname};
-		$diskinfo->{mountpoint} = $info->{mountpoint};
-		
-		$diskinfo->{lvmvg} = $lvmvg;
-		$diskinfo->{lvmlv} = $lvmlv;
-		
-		$diskinfo->{fstype}  = $fstype;
-		$diskinfo->{lvmpath} = $lvmpath;
-
-		$diskinfo->{snappath} = $path;
-		$diskinfo->{snappath} =~ s|/?$lvmpath/?|$diskinfo->{mountpoint}/|;
-	    }
 	}
 
 	push @{$task->{disks}}, $diskinfo;
-
-    });
-
-    $task->{snapshot_count} = $snapshot_count;
+    }
 }
 
 sub vm_status {
     my ($self, $vmid) = @_;
 
     my $running = PVE::QemuServer::check_running($vmid) ? 1 : 0;
-  
-    return wantarray ? ($running, $running ? 'running' : 'stopped') : $running; 
+
+    return wantarray ? ($running, $running ? 'running' : 'stopped') : $running;
 }
 
 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 {
@@ -214,216 +183,718 @@ sub resume_vm {
     $self->cmd ("qm resume $vmid --skiplock");
 }
 
-sub snapshot_alloc {
-    my ($self, $storeid, $name, $size, $srcdev) = @_;
+sub assemble {
+    my ($self, $task, $vmid) = @_;
 
-    my $cmd = "lvcreate --size ${size}M --snapshot --name '$name' '$srcdev'";
+    my $conffile = PVE::QemuConfig->config_file($vmid);
 
-    if ($storeid) {
+    my $outfile = "$task->{tmpdir}/qemu-server.conf";
+    my $firewall_src = "/etc/pve/firewall/$vmid.fw";
+    my $firewall_dest = "$task->{tmpdir}/qemu-server.fw";
+
+    my $outfd = IO::File->new (">$outfile") ||
+	die "unable to open '$outfile'";
+    my $conffd = IO::File->new ($conffile, 'r') ||
+	die "unable open '$conffile'";
+
+    my $found_snapshot;
+    my $found_pending;
+    while (defined (my $line = <$conffd>)) {
+	next if $line =~ m/^\#vzdump\#/; # just to be sure
+	next if $line =~ m/^\#qmdump\#/; # just to be sure
+	if ($line =~ m/^\[(.*)\]\s*$/) {
+	    if ($1 =~ m/PENDING/i) {
+		$found_pending = 1;
+	    } else {
+		$found_snapshot = 1;
+	    }
+	}
+	next if $found_snapshot || $found_pending; # skip all snapshots and pending changes config data
 
-	my $scfg = PVE::Storage::storage_config ($self->{storecfg}, $storeid);
+	if ($line =~ m/^unused\d+:\s*(\S+)\s*/) {
+	    $self->loginfo("skip unused drive '$1' (not included into backup)");
+	    next;
+	}
+	next if $line =~ m/^lock:/ || $line =~ m/^parent:/;
 
-	# lock shared storage
-	return PVE::Storage::cluster_lock_storage ($storeid, $scfg->{shared}, undef, sub {
-		$self->cmd ($cmd);
-	});
-    } else {
-	$self->cmd ($cmd);
+	print $outfd $line;
+    }
+
+    foreach my $di (@{$task->{disks}}) {
+	if ($di->{type} eq 'block' || $di->{type} eq 'file') {
+	    my $storeid = $di->{storeid} || '';
+	    my $format = $di->{format} || '';
+	    print $outfd "#qmdump#map:$di->{virtdev}:$di->{qmdevice}:$storeid:$format:\n";
+	} else {
+	    die "internal error";
+	}
+    }
+
+    if ($found_snapshot) {
+	$self->loginfo("snapshots found (not included into backup)");
+    }
+    if ($found_pending) {
+	$self->loginfo("pending configuration changes found (not included into backup)");
     }
+
+    PVE::Tools::file_copy($firewall_src, $firewall_dest) if -f $firewall_src;
 }
 
-sub snapshot_free {
-    my ($self, $storeid, $name, $snapdev, $noerr) = @_;
+sub archive {
+    my ($self, $task, $vmid, $filename, $comp) = @_;
 
-    my $cmd = ['lvremove', '-f', $snapdev];
+    my $opts = $self->{vzdump}->{opts};
+    my $scfg = $opts->{scfg};
 
-    # loop, because we often get 'LV in use: not deactivating'
-    # we use run_command() because we do not want to log errors here
-    my $wait = 1;
-    while(-b $snapdev) {
-	eval {
-	    if ($storeid) {
-		my $scfg = PVE::Storage::storage_config ($self->{storecfg}, $storeid);
-		# lock shared storage
-		return PVE::Storage::cluster_lock_storage($storeid, $scfg->{shared}, undef, sub {
-		    PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => {});
-		});
-	    } else {
-		PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => {});
-	    }
-	};
-	my $err = $@;
-	last if !$err;
-	if ($wait >= 64) {
-	    $self->logerr($err);
-	    die $@ if !$noerr;
-	    last;
-	}
-	$self->loginfo("lvremove failed - trying again in $wait seconds") if $wait >= 8;
-	sleep($wait);
-	$wait = $wait*2;
+    if ($self->{vzdump}->{opts}->{pbs}) {
+	$self->archive_pbs($task, $vmid);
+    } else {
+	$self->archive_vma($task, $vmid, $filename, $comp);
     }
 }
 
-sub snapshot {
-    my ($self, $task, $vmid) = @_;
+# number, [precision=1]
+my $num2str = sub {
+    return sprintf( "%." . ( $_[1] || 1 ) . "f", $_[0] );
+};
+my sub bytes_to_human {
+    my ($bytes, $precission) = @_;
 
-    my $opts = $self->{vzdump}->{opts};
+    return $num2str->($bytes, $precission) . ' B' if $bytes < 1024;
+    my $kb = $bytes/1024;
 
-    my $mounts = {};
+    return $num2str->($kb, $precission) . " KiB" if $kb < 1024;
+    my $mb = $kb/1024;
 
-    foreach my $di (@{$task->{disks}}) {
-	if ($di->{type} eq 'block') {
+    return $num2str->($mb, $precission) . " MiB" if $mb < 1024;
+    my $gb = $mb/1024;
 
-	    if (-b $di->{snapdev}) {
-		$self->loginfo ("trying to remove stale snapshot '$di->{snapdev}'");
-		$self->snapshot_free ($di->{storeid}, $di->{snapname}, $di->{snapdev}, 1); 
-	    }
+    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;
 
-	    $di->{cleanup_lvm} = 1;
-	    $self->snapshot_alloc ($di->{storeid}, $di->{snapname}, $opts->{size},
-				   "/dev/$di->{lvmvg}/$di->{lvmlv}"); 
+    return sprintf('%2dm %2ds', $minutes, $seconds) if $minutes < 60;
+    my $hours = $minutes / 60;
+    $minutes = $minutes % 60;
 
-	} elsif ($di->{type} eq 'file') {
+    return sprintf('%2dh %2dm %2ds', $hours, $minutes, $seconds) if $hours < 24;
+    my $days = $hours / 24;
+    $hours = $hours % 24;
 
-	    next if defined ($mounts->{$di->{mountpoint}}); # already mounted
+    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";
+    };
 
-	    if (-b $di->{snapdev}) {
-		$self->loginfo ("trying to remove stale snapshot '$di->{snapdev}'");	    
-	    
-		$self->cmd_noerr ("umount $di->{mountpoint}");
-		$self->snapshot_free ($di->{storeid}, $di->{snapname}, $di->{snapdev}, 1); 
+    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");
+	}
+    }
 
-	    mkpath $di->{mountpoint}; # create mount point for lvm snapshot
+    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);
+	}
 
-	    $di->{cleanup_lvm} = 1;
+	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);
 
-	    $self->snapshot_alloc ($di->{storeid}, $di->{snapname}, $opts->{size},
-				   "/dev/$di->{lvmvg}/$di->{lvmlv}"); 
-	    
-	    my $mopts = $di->{fstype} eq 'xfs' ? "-o nouuid" : '';
+	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");
+	}
 
-	    $di->{snapshot_mount} = 1;
+	my $statusline = sprintf("%3d%% ($transferred_h of $target_h) in %s"
+	    .", read: $mbps_read, write: $mbps_write", $percent, duration_to_human($duration));
 
-	    $self->cmd ("mount -t $di->{fstype} $mopts $di->{snapdev} $di->{mountpoint}");
+	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;
+    }
 
-	    $mounts->{$di->{mountpoint}} = 1;
+    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 {
-	    die "implement me";
+	    $self->loginfo("transferred $transferred_h in <1 seconds");
 	}
     }
-}
 
-sub get_size {
-    my $path = shift;
-
-    if (-f $path) {
-	return -s $path;
-    } elsif (-b $path) {
-	my $fh = IO::File->new ($path, "r");
-	die "unable to open '$path' to detect device size\n" if !$fh;
-	my $size = sysseek $fh, 0, 2;
-	$fh->close();
-	die "unable to detect device size for '$path'\n" if !$size;
-	return $size;
-    }
-}
+    return {
+	total => $last_total,
+	reused => $reused,
+    };
+};
 
-sub assemble {
+sub archive_pbs {
     my ($self, $task, $vmid) = @_;
 
-    my $conffile = PVE::QemuServer::config_file ($vmid);
+    my $conffile = "$task->{tmpdir}/qemu-server.conf";
+    my $firewall = "$task->{tmpdir}/qemu-server.fw";
 
-    my $outfile = "$task->{tmpdir}/qemu-server.conf";
+    my $opts = $self->{vzdump}->{opts};
+    my $scfg = $opts->{scfg};
+
+    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);
 
-    my $outfd;
-    my $conffd;
+    $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";
+	};
 
-	$outfd = IO::File->new (">$outfile") ||
-	    die "unable to open '$outfile'";
-	$conffd = IO::File->new ($conffile, 'r') ||
-	    die "unable open '$conffile'";
+	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";
+	}
 
-	while (defined (my $line = <$conffd>)) {
-	    next if $line =~ m/^\#vzdump\#/; # just to be sure
-	    print $outfd $line;
+	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;
 	}
 
-	foreach my $di (@{$task->{disks}}) {
-	    if ($di->{type} eq 'block' || $di->{type} eq 'file') {
-		my $size = get_size ($di->{snappath});
-		my $storeid = $di->{storeid} || '';
-		print $outfd "#vzdump#map:$di->{virtdev}:$di->{filename}:$size:$storeid:\n";
-	    } else {
-		die "internal error";
-	    }
+	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);
 
-    close ($outfd) if $outfd;
-    close ($conffd) if $conffd;
-    
     die $err if $err;
 }
 
-sub archive {
-    my ($self, $task, $vmid, $filename) = @_;
+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 $starttime = time();
+
+    my $speed = 0;
+    if ($opts->{bwlimit}) {
+	$speed = $opts->{bwlimit}*1024;
+    }
+
+    my $diskcount = scalar(@{$task->{disks}});
+    if (PVE::QemuConfig->is_template($self->{vmlist}->{$vmid}) || !$diskcount) {
+	my @pathlist;
+	foreach my $di (@{$task->{disks}}) {
+	    if ($di->{type} eq 'block' || $di->{type} eq 'file') {
+		push @pathlist, "$di->{qmdevice}=$di->{path}";
+	    } else {
+		die "implement me";
+	    }
+	}
+
+	if (!$diskcount) {
+	    $self->loginfo("backup contains no disks");
+	}
+
+	my $outcmd;
+	if ($comp) {
+	    $outcmd = "exec:$comp";
+	} else {
+	    $outcmd = "exec:cat";
+	}
+
+	$outcmd .= " > $filename" if !$opts->{stdout};
+
+	my $cmd = ['/usr/bin/vma', 'create', '-v', '-c', $conffile];
+	push @$cmd, '-c', $firewall if -e $firewall;
+	push @$cmd, $outcmd, @pathlist;
+
+	$self->loginfo("starting template backup");
+	$self->loginfo(join(' ', @$cmd));
+
+	if ($opts->{stdout}) {
+	    $self->cmd($cmd, output => ">&" . fileno($opts->{stdout}));
+	} else {
+	    $self->cmd($cmd);
+	}
+
+	return;
+    }
+
+    my $devlist = _get_task_devlist($task);
+
+    $self->enforce_vm_running_for_backup($vmid);
 
-    my $fh;
+    my $cpid;
+    my $backup_job_uuid;
 
-    my @filea = ($conffile, 'qemu-server.conf'); # always first file in tar
+    eval {
+	$SIG{INT} = $SIG{TERM} = $SIG{QUIT} = $SIG{HUP} = $SIG{PIPE} = sub {
+	    die "interrupted by signal\n";
+	};
+
+	my $outfh;
+	if ($opts->{stdout}) {
+	    $outfh = $opts->{stdout};
+	} else {
+	    $outfh = IO::File->new($filename, "w") ||
+		die "unable to open file '$filename' - $!\n";
+	}
+	my $outfileno = fileno($outfh);
+
+	if ($comp) {
+	    ($cpid, $outfileno) = $fork_compressor_pipe->($self, $comp, $outfileno);
+	}
+
+	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 = {
+		'backup-file' => "/dev/fdname/backup",
+		speed => $speed,
+		'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");
+
+	my $fs_frozen = $self->qga_fs_freeze($task, $vmid);
+
+	eval { $qmpclient->queue_execute(30) };
+	my $qmperr = $@;
+
+	if ($fs_frozen) {
+	    $self->qga_fs_thaw($vmid);
+	}
+
+	die $qmperr if $qmperr;
+	die $qmpclient->{errors}->{$vmid} if $qmpclient->{errors}->{$vmid};
+
+	if ($cpid) {
+	    POSIX::close($outfileno) == 0 ||
+		die "close output file handle failed\n";
+	}
+
+	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);
+
+	$query_backup_status_loop->($self, $vmid, $backup_job_uuid);
+    };
+    my $err = $@;
+    if ($err) {
+	$self->logerr($err);
+	$self->mon_backup_cancel($vmid) if defined($backup_job_uuid);
+    }
+
+    $self->restore_vm_power_state($vmid);
+
+    if ($err) {
+	if ($cpid) {
+	    kill(9, $cpid);
+	    waitpid($cpid, 0);
+	}
+	die $err;
+    }
+
+    if ($cpid && (waitpid($cpid, 0) > 0)) {
+	my $stat = $?;
+	my $ec = $stat >> 8;
+	my $signal = $stat & 127;
+	if ($ec || $signal) {
+	    die "$comp failed - wrong exit status $ec" .
+		($signal ? " (signal $signal)\n" : "\n");
+	}
+    }
+}
+
+sub _get_task_devlist {
+    my ($task) = @_;
+
+    my $devlist = '';
     foreach my $di (@{$task->{disks}}) {
 	if ($di->{type} eq 'block' || $di->{type} eq 'file') {
-	    push @filea, $di->{snappath}, $di->{filename};
+	    $devlist .= ',' if $devlist;
+	    $devlist .= $di->{qmdevice};
 	} else {
-	    die "implement me";
+	    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};
 
-    my $files = join (' ', map { "'$_'" } @filea);
-    
-    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 (!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 $@;
+}
 
-    if ($opts->{stdout}) {
-	$self->cmd ($cmd, output => ">&=" . fileno($opts->{stdout}));
+# 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->cmd ("$cmd >$filename");
+	$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) = @_;
+
+    # nothing to do
 }
 
 sub cleanup {
     my ($self, $task, $vmid) = @_;
 
-   foreach my $di (@{$task->{disks}}) {
-       
-       if ($di->{snapshot_mount}) {
-	   $self->cmd_noerr ("umount $di->{mountpoint}");
-       }
-
-       if ($di->{cleanup_lvm}) {
-	   if (-b $di->{snapdev}) {
-	       if ($di->{type} eq 'block') {
-		   $self->snapshot_free ($di->{storeid}, $di->{snapname}, $di->{snapdev}, 1);
-	       } elsif ($di->{type} eq 'file') {
-		   $self->snapshot_free ($di->{storeid}, $di->{snapname}, $di->{snapdev}, 1);
-	       }
-	   }
-       }
-   }
+    # nothing to do ?
 }
 
 1;