proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-07 18:27:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vzdump: restore log behavior for VMs running with older QEMU

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-08-20 10:45:34 +02:00
parent a40295b6aa
commit f856671495
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PVE/VZDump/QemuServer.pm
View File

@ -320,7 +320,7 @@ my $bitmap_action_to_human = sub {
}; };
my $query_backup_status_loop = sub { my $query_backup_status_loop = sub {
my ($self, $vmid, $job_uuid, $pbs_features) = @_; my ($self, $vmid, $job_uuid, $qemu_support) = @_;
my $starttime = time (); my $starttime = time ();
my $last_time = $starttime; my $last_time = $starttime;
@ -336,9 +336,8 @@ my $query_backup_status_loop = sub {
my $target = 0; my $target = 0;
my $last_reused = 0; my $last_reused = 0;
my $has_query_bitmap = 0; my $has_query_bitmap = $qemu_support && $qemu_support->{'query-bitmap-info'};
if (defined($pbs_features) && $pbs_features->{'query-bitmap-info'}) { if ($has_query_bitmap) {
$has_query_bitmap = 1;
my $total = 0; my $total = 0;
my $bitmap_info = mon_cmd($vmid, 'query-pbs-bitmap-info'); my $bitmap_info = mon_cmd($vmid, 'query-pbs-bitmap-info');
foreach my $info (sort { $a->{drive} cmp $b->{drive} } @$bitmap_info) { foreach my $info (sort { $a->{drive} cmp $b->{drive} } @$bitmap_info) {
@ -357,11 +356,13 @@ my $query_backup_status_loop = sub {
} }
} }
my $first_round = 1;
while(1) { while(1) {
my $status = mon_cmd($vmid, 'query-backup'); my $status = mon_cmd($vmid, 'query-backup');
my $total = $status->{total} || 0; my $total = $status->{total} || 0;
$target = $total if !$has_query_bitmap; my $dirty = $status->{dirty};
$target = (defined($dirty) && $dirty < $total) ? $dirty : $total if !$has_query_bitmap;
$transferred = $status->{transferred} || 0; $transferred = $status->{transferred} || 0;
$reused = $status->{reused}; $reused = $status->{reused};
my $percent = $target ? int(($transferred * 100)/$target) : 100; my $percent = $target ? int(($transferred * 100)/$target) : 100;
@ -387,6 +388,11 @@ my $query_backup_status_loop = sub {
my $target_h = bytes_to_human($target); my $target_h = bytes_to_human($target);
my $transferred_h = bytes_to_human($transferred); 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" my $statusline = sprintf("%3d%% ($transferred_h of $target_h) in %s"
.", read: $mbps_read, write: $mbps_write", $percent, duration_to_human($duration)); .", read: $mbps_read, write: $mbps_write", $percent, duration_to_human($duration));
@ -414,6 +420,7 @@ my $query_backup_status_loop = sub {
$last_reused = $reused; $last_reused = $reused;
} }
sleep(1); sleep(1);
$first_round = 0 if $first_round;
} }
my $duration = time() - $starttime; my $duration = time() - $starttime;