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

vzdump: followup: log total dirtiness again, minor output adaptions

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-08-19 20:30:30 +02:00
parent db3272d084
commit 13ddc7eb91
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PVE/VZDump/QemuServer.pm
View File

@ -276,23 +276,24 @@ sub bytes_to_human {
}; };
my $bitmap_action_to_human = sub { my $bitmap_action_to_human = sub {
my ($info) = @_; my ($self, $info) = @_;
my $action = $info->{action}; my $action = $info->{action};
if ($action eq "not-used") { if ($action eq "not-used") {
return "disabled"; return "disabled (no support)" if $self->{vm_was_running};
return "disabled (VM not running)";
} elsif ($action eq "not-used-removed") { } elsif ($action eq "not-used-removed") {
return "disabled (old bitmap cleared)"; return "disabled (old bitmap cleared)";
} elsif ($action eq "new") { } elsif ($action eq "new") {
return "created new bitmap"; return "created new";
} elsif ($action eq "used") { } elsif ($action eq "used") {
if ($info->{dirty} == 0) { if ($info->{dirty} == 0) {
return "OK, drive clean"; return "OK (drive clean)";
} else { } else {
my $size = bytes_to_human($info->{size}); my $size = bytes_to_human($info->{size});
my $dirty = bytes_to_human($info->{dirty}); my $dirty = bytes_to_human($info->{dirty});
return "OK, $dirty of $size dirty"; return "OK ($dirty of $size dirty)";
} }
} elsif ($action eq "invalid") { } elsif ($action eq "invalid") {
return "existing bitmap was invalid and has been cleared"; return "existing bitmap was invalid and has been cleared";
@ -321,16 +322,22 @@ my $query_backup_status_loop = sub {
my $has_query_bitmap = 0; my $has_query_bitmap = 0;
if (defined($pbs_features) && $pbs_features->{'query-bitmap-info'}) { if (defined($pbs_features) && $pbs_features->{'query-bitmap-info'}) {
$has_query_bitmap = 1; $has_query_bitmap = 1;
my $total = 0;
my $bitmap_info = mon_cmd($vmid, 'query-pbs-bitmap-info'); my $bitmap_info = mon_cmd($vmid, 'query-pbs-bitmap-info');
$self->loginfo("Fast incremental status:"); foreach my $info (sort { $a->{drive} cmp $b->{drive} } @$bitmap_info) {
foreach my $info (@$bitmap_info) { my $text = $bitmap_action_to_human->($self, $info);
my $text = $bitmap_action_to_human->($info);
my $drive = $info->{drive}; my $drive = $info->{drive};
$drive =~ s/^drive-//; # for consistency $drive =~ s/^drive-//; # for consistency
$self->loginfo("$drive: $text"); $self->loginfo("$drive: dirty-bitmap status: $text");
$target += $info->{dirty}; $target += $info->{dirty};
$total += $info->{size};
$last_reused += $info->{size} - $info->{dirty}; $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");
}
} }
while(1) { while(1) {