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.rei...@proxmox.com>
---
PVE/VZDump/QemuServer.pm | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index 6420bf4..5edc62b 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -306,7 +306,7 @@ my $query_backup_status_loop = sub {
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 $get_mbps = sub {
@@ -317,6 +317,7 @@ my $query_backup_status_loop = sub {
};
my $target = 0;
+ my $last_reused = 0;
my $has_query_bitmap = 0;
if (defined($pbs_features) && $pbs_features->{'query-bitmap-info'}) {
$has_query_bitmap = 1;
@@ -328,6 +329,7 @@ my $query_backup_status_loop = sub {
$drive =~ s/^drive-//; # for consistency
$self->loginfo("$drive: $text");
$target += $info->{dirty};
+ $last_reused += $info->{size} - $info->{dirty};
}
}
@@ -347,7 +349,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);
@@ -379,6 +387,7 @@ my $query_backup_status_loop = sub {
$last_zero = $zero if $zero;
$last_transferred = $transferred if $transferred;
$last_time = $ctime;
+ $last_reused = $reused;
}
sleep(1);
}
--
2.20.1
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
