proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-07-03 05:46:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migrate: fix warning about uninitialized values

Browse Source 
And display acurate byte values instead of KB
This commit is contained in:
Dietmar Maurer 2012-07-13 12:37:19 +02:00
parent f0002f62f1
commit a05b47a8a8
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
PVE/QemuMigrate.pm
View File

@ -329,28 +329,13 @@ sub phase2 {
}; };
my $merr = $@; my $merr = $@;
my $lstat = undef; my $lstat = 0;
while (1) { while (1) {
sleep (2); sleep (2);
my $stat = PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "query-migrate"); my $stat = PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "query-migrate");
if ($stat->{status} =~ m/^(active|completed|failed|cancelled)$/im) { if ($stat->{status} =~ m/^(active|completed|failed|cancelled)$/im) {
$merr = undef; $merr = undef;
if ($stat->{ram}->{transferred} ne $lstat) {
if ($stat->{status} eq 'active') {
my ($trans, $rem, $total) = (0, 0, 0);
$trans = sprintf "%.2f", $stat->{ram}->{transferred}/1024 if $stat->{ram}->{transferred};
$rem = sprintf "%.2f", $stat->{ram}->{remaining}/1024 if $stat->{ram}->{remaining};
$total = sprintf "%.2f", $stat->{ram}->{total}/1024 if $stat->{ram}->{total};
$self->log('info', "migration status: $stat->{status} (transferred ${trans}KB, " .
"remaining ${rem}KB), total ${total}KB)");
} else {
$self->log('info', "migration status: $stat->{status}");
}
}
if ($stat->{status} eq 'completed') { if ($stat->{status} eq 'completed') {
my $delay = time() - $start; my $delay = time() - $start;
if ($delay > 0) { if ($delay > 0) {
@ -363,13 +348,27 @@ sub phase2 {
die "aborting\n" die "aborting\n"
} }
last if $stat->{status} ne 'active'; if ($stat->{status} ne 'active') {
$self->log('info', "migration status: $stat->{status}");
last;
}
if ($stat->{ram}->{transferred} ne $lstat) {
my $trans = $stat->{ram}->{transferred} || 0;
my $rem = $stat->{ram}->{remaining} || 0;
my $total = $stat->{ram}->{total} || 0;
$self->log('info', "migration status: $stat->{status} (transferred ${trans}, " .
"remaining ${rem}), total ${total})");
}
$lstat = $stat->{ram}->{transferred};
} else { } else {
die $merr if $merr; die $merr if $merr;
die "unable to parse migration status '$stat->{status}' - aborting\n"; die "unable to parse migration status '$stat->{status}' - aborting\n";
} }
$lstat = $lstat->{ram}->{transferred}; }
};
} }
sub phase3 { sub phase3 {