proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-07-23 17:34:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mirror monitor: rework periodic status reporting

Browse Source 
orient on the backup output which got reworked for PVE 6.2/6.3

Avoid overwhelming the user with redundant information, and use human
readable units.

before:
> restore-drive-scsi5: transferred: 167772160 bytes remaining: 8422162432 bytes total: 8589934592 bytes progression: 1.95 % busy: 1 ready: 0

after:
> restore-drive-scsi0: transferred 720.0 MiB of 32.0 GiB (2.20%) in 12s

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-04-06 19:39:41 +02:00
parent a09b39f163
commit 3b56383bdb
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
PVE/QemuServer.pm
View File

@ -30,6 +30,7 @@ use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_write_file);
use PVE::CGroup; use PVE::CGroup;
use PVE::DataCenterConfig; use PVE::DataCenterConfig;
use PVE::Exception qw(raise raise_param_exc); use PVE::Exception qw(raise raise_param_exc);
use PVE::Format qw(render_duration render_bytes);
use PVE::GuestHelpers qw(safe_string_ne safe_num_ne safe_boolean_ne); use PVE::GuestHelpers qw(safe_string_ne safe_num_ne safe_boolean_ne);
use PVE::INotify; use PVE::INotify;
use PVE::JSONSchema qw(get_standard_option parse_property_string); use PVE::JSONSchema qw(get_standard_option parse_property_string);
@ -7058,10 +7059,12 @@ sub qemu_drive_mirror_monitor {
eval { eval {
my $err_complete = 0; my $err_complete = 0;
my $starttime = time ();
while (1) { while (1) {
die "block job ('$op') timed out\n" if $err_complete > 300; die "block job ('$op') timed out\n" if $err_complete > 300;
my $stats = mon_cmd($vmid, "query-block-jobs"); my $stats = mon_cmd($vmid, "query-block-jobs");
my $ctime = time();
my $running_jobs = {}; my $running_jobs = {};
for my $stat (@$stats) { for my $stat (@$stats) {
@ -7077,7 +7080,7 @@ sub qemu_drive_mirror_monitor {
my $vanished = !defined($job); my $vanished = !defined($job);
my $complete = defined($jobs->{$job_id}->{complete}) && $vanished; my $complete = defined($jobs->{$job_id}->{complete}) && $vanished;
if($complete || ($vanished && $completion eq 'auto')) { if($complete || ($vanished && $completion eq 'auto')) {
print "$job_id: finished\n"; print "$job_id: $op-job finished\n";
delete $jobs->{$job_id}; delete $jobs->{$job_id};
next; next;
} }
@ -7091,7 +7094,23 @@ sub qemu_drive_mirror_monitor {
my $remaining = $total - $transferred; my $remaining = $total - $transferred;
my $percent = sprintf "%.2f", ($transferred * 100 / $total); my $percent = sprintf "%.2f", ($transferred * 100 / $total);
print "$job_id: transferred: $transferred bytes remaining: $remaining bytes total: $total bytes progression: $percent % busy: $busy ready: $ready \n"; my $duration = $ctime - $starttime;
my $total_h = render_bytes($total, 1);
my $transferred_h = render_bytes($transferred, 1);
my $status = sprintf(
"transferred $transferred_h of $total_h ($percent%%) in %s",
render_duration($duration),
);
if ($ready) {
if ($busy) {
$status .= ", still busy"; # shouldn't even happen? but mirror is weird
} else {
$status .= ", ready";
}
}
print "$job_id: $status\n";
} }
$readycounter++ if $job->{ready}; $readycounter++ if $job->{ready};
@ -7143,7 +7162,7 @@ sub qemu_drive_mirror_monitor {
} }
eval { mon_cmd($vmid, $op, device => $job_id) }; eval { mon_cmd($vmid, $op, device => $job_id) };
if ($@ =~ m/cannot be completed/) { if ($@ =~ m/cannot be completed/) {
print "$job_id: Block job cannot be completed, try again.\n"; print "$job_id: block job cannot be completed, trying again.\n";
$err_complete++; $err_complete++;
}else { }else {
print "$job_id: Completed successfully.\n"; print "$job_id: Completed successfully.\n";
@ -7159,9 +7178,8 @@ sub qemu_drive_mirror_monitor {
if ($err) { if ($err) {
eval { PVE::QemuServer::qemu_blockjobs_cancel($vmid, $jobs) }; eval { PVE::QemuServer::qemu_blockjobs_cancel($vmid, $jobs) };
die "block job ('$op') error: $err"; die "block job ($op) error: $err";
} }
} }
sub qemu_blockjobs_cancel { sub qemu_blockjobs_cancel {