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

vzdump: display actually uploaded chunks as 'write' speed

Browse Source 
Previously 'read' and 'write' would always show the same value, which is
of little use. Change it so 'write' excludes reused bytes, thus
displaying the actual upload speed.

$last_reused needs to be initialized to contain reused data from 'clean'
dirty bitmaps to ensure the first output line is correct.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2020-08-19 17:02:02 +02:00 committed by Thomas Lamprecht
parent 3a44897f74
commit 8825248c43
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/VZDump/QemuServer.pm
View File

@ -306,7 +306,7 @@ my $query_backup_status_loop = sub {
my $starttime = time (); my $starttime = time ();
my $last_time = $starttime; 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 ($transferred, $reused);
my $get_mbps = sub { my $get_mbps = sub {
@ -317,6 +317,7 @@ my $query_backup_status_loop = sub {
}; };
my $target = 0; my $target = 0;
my $last_reused = 0;
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;
@ -328,6 +329,7 @@ my $query_backup_status_loop = sub {
$drive =~ s/^drive-//; # for consistency $drive =~ s/^drive-//; # for consistency
$self->loginfo("$drive: $text"); $self->loginfo("$drive: $text");
$target += $info->{dirty}; $target += $info->{dirty};
$last_reused += $info->{size} - $info->{dirty};
} }
} }
@ -347,7 +349,13 @@ my $query_backup_status_loop = sub {
my $duration = $ctime - $starttime; my $duration = $ctime - $starttime;
my $rbytes = $transferred - $last_transferred; 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 $timediff = ($ctime - $last_time) || 1; # fixme
my $mbps_read = $get_mbps->($rbytes, $timediff); my $mbps_read = $get_mbps->($rbytes, $timediff);
@ -379,6 +387,7 @@ my $query_backup_status_loop = sub {
$last_zero = $zero if $zero; $last_zero = $zero if $zero;
$last_transferred = $transferred if $transferred; $last_transferred = $transferred if $transferred;
$last_time = $ctime; $last_time = $ctime;
$last_reused = $reused;
} }
sleep(1); sleep(1);
} }