X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FVZDump%2FQemuServer.pm;h=8792e766f27b3c1573edd90245ce83aabf57aa4d;hb=edae17185b11ba8c9e88b10c29eacadbf87d6456;hp=ff4a6a2002efba115b1568b2061456cee2cf7043;hpb=b4be9c0207ae634ab82265d25e7ff59604a3b709;p=qemu-server.git

diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index ff4a6a2..8792e76 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -257,7 +257,7 @@ sub archive {
 my $num2str = sub {
     return sprintf( "%." . ( $_[1] || 1 ) . "f", $_[0] );
 };
-sub bytes_to_human {
+my sub bytes_to_human {
     my ($bytes, $precission) = @_;
 
     return $num2str->($bytes, $precission) . ' B' if $bytes < 1024;
@@ -273,16 +273,59 @@ sub bytes_to_human {
     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) = @_;
+    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 ($last_percent, $last_total, $last_target, $last_zero, $last_transferred) = (-1, 0, 0, 0, 0);
     my ($transferred, $reused);
-    my $first_round = 1;
 
     my $get_mbps = sub {
 	my ($mb, $delta) = @_;
@@ -291,15 +334,42 @@ my $query_backup_status_loop = sub {
 	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};
-	my $target = (defined($dirty) && $dirty < $total) ? $dirty : $total;
+	$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) : 0;
+	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);
@@ -308,7 +378,13 @@ my $query_backup_status_loop = sub {
 	my $duration = $ctime - $starttime;
 
 	my $rbytes = $transferred - $last_transferred;
-	my $wbytes = $rbytes - ($zero - $last_zero);
+	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);
@@ -316,17 +392,19 @@ my $query_backup_status_loop = sub {
 	my $target_h = bytes_to_human($target);
 	my $transferred_h = bytes_to_human($transferred);
 
-	if ($first_round && $target != $total) {
+	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 = "status: $percent% ($transferred_h of $target_h), duration $duration"
-	    .", read: $mbps_read, write: $mbps_write";
+	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') {
-	    $self->loginfo($statusline);
+	    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";
@@ -345,29 +423,37 @@ my $query_backup_status_loop = sub {
 	    $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 backup validation...");
+	    }
+	    $last_finishing = $status->{finishing};
 	}
 	sleep(1);
-	$first_round = 0;
+	$first_round = 0 if $first_round;
     }
 
     my $duration = time() - $starttime;
-    if ($transferred && $duration) {
-	my $transferred_h = bytes_to_human($transferred, 2);
-	my $mbps = $get_mbps->($transferred, $duration);
-	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}%) from last backup");
-	    $self->loginfo("transferred $transferred_h in $duration seconds ($mbps)");
-	} else {
-	    $self->loginfo("transferred $transferred_h in $duration seconds ($mbps)");
-	}
-    }
 
     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_per}% ($zero_h) zero data");
+	$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 {
@@ -394,22 +480,14 @@ sub archive_pbs {
 
     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}});
-    if (PVE::QemuConfig->is_template($self->{vmlist}->{$vmid}) || !$diskcount) {
+    # proxmox-backup-client can only handle raw files and block devs
+    # only use it (directly) for disk-less VMs
+    if (!$diskcount) {
 	my @pathlist;
-	# FIXME: accumulate disk sizes to use for backup job (email) log
-	foreach my $di (@{$task->{disks}}) {
-	    if ($di->{type} eq 'block' || $di->{type} eq 'file') {
-		push @pathlist, "$di->{qmdevice}.img:$di->{path}";
-	    } else {
-		die "implement me (type $di->{type})";
-	    }
-	}
-
-	if (!$diskcount) {
-	    $self->loginfo("backup contains no disks");
-	}
+	$self->loginfo("backup contains no disks");
 
 	local $ENV{PBS_PASSWORD} = $password;
 	local $ENV{PBS_FINGERPRINT} = $fingerprint if defined($fingerprint);
@@ -424,7 +502,6 @@ sub archive_pbs {
 
 	push @$cmd, "qemu-server.conf:$conffile";
 	push @$cmd, "fw.conf:$firewall" if -e $firewall;
-	push @$cmd, @pathlist if scalar(@pathlist);
 
 	$self->loginfo("starting template backup");
 	$self->loginfo(join(' ', @$cmd));
@@ -445,6 +522,12 @@ sub archive_pbs {
 	    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 = {
@@ -455,10 +538,21 @@ sub archive_pbs {
 	    password => $password,
 	    devlist => $devlist,
 	    'config-file' => $conffile,
-	    'use-dirty-bitmap' => JSON::true,
 	};
+	$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
 
@@ -477,13 +571,13 @@ sub archive_pbs {
 
 	$self->resume_vm_after_job_start($task, $vmid);
 
-	my $res = $query_backup_status_loop->($self, $vmid, $backup_job_uuid);
-	$task->{size} = $res->{total};
+	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->mon_backup_cancel($vmid);
     }
     $self->restore_vm_power_state($vmid);
 
@@ -660,7 +754,7 @@ sub archive_vma {
     my $err = $@;
     if ($err) {
 	$self->logerr($err);
-	$self->mon_backup_cancel($vmid) if defined($backup_job_uuid);
+	$self->mon_backup_cancel($vmid);
     }
 
     $self->restore_vm_power_state($vmid);
@@ -739,6 +833,7 @@ sub enforce_vm_running_for_backup {
 	# start with skiplock
 	my $params = {
 	    skiplock => 1,
+	    skiptemplate => 1,
 	    paused => 1,
 	};
 	PVE::QemuServer::vm_start($self->{storecfg}, $vmid, $params);