proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-21 19:44:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migration: factor out variable + code cleanup

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-04-19 21:51:21 +02:00
parent 7de328c629
commit e693c49190
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/QemuMigrate.pm
View File

@ -1031,7 +1031,7 @@ sub phase2 {
my $merr = $@; my $merr = $@;
$self->log('info', "migrate uri => $ruri failed: $merr") if $merr; $self->log('info', "migrate uri => $ruri failed: $merr") if $merr;
my $lstat = 0; my $last_mem_transferred = 0;
my $usleep = 1000000; my $usleep = 1000000;
my $i = 0; my $i = 0;
my $err_count = 0; my $err_count = 0;
@ -1039,7 +1039,7 @@ sub phase2 {
my $downtimecounter = 0; my $downtimecounter = 0;
while (1) { while (1) {
$i++; $i++;
my $avglstat = $lstat ? $lstat / $i : 0; my $avglstat = $last_mem_transferred ? $last_mem_transferred / $i : 0;
usleep($usleep); usleep($usleep);
@ -1068,6 +1068,8 @@ sub phase2 {
$merr = undef; $merr = undef;
$err_count = 0; $err_count = 0;
my $memstat = $stat->{ram};
if ($status eq 'completed') { if ($status eq 'completed') {
my $delay = time() - $start; my $delay = time() - $start;
if ($delay > 0) { if ($delay > 0) {
@ -1087,10 +1089,10 @@ sub phase2 {
last; last;
} }
if ($stat->{ram}->{transferred} ne $lstat) { if ($memstat->{transferred} ne $last_mem_transferred) {
my $trans = $stat->{ram}->{transferred} || 0; my $trans = $memstat->{transferred} || 0;
my $rem = $stat->{ram}->{remaining} || 0; my $rem = $memstat->{remaining} || 0;
my $total = $stat->{ram}->{total} || 0; my $total = $memstat->{total} || 0;
my $xbzrle = $stat->{"xbzrle-cache"} || {}; my $xbzrle = $stat->{"xbzrle-cache"} || {};
my $xbzrlecachesize = $xbzrle->{"cache-size"} || 0; my $xbzrlecachesize = $xbzrle->{"cache-size"} || 0;
@ -1111,7 +1113,7 @@ sub phase2 {
$self->log('info', "migration xbzrle cachesize: ${xbzrlecachesize} transferred ${xbzrlebytes} pages ${xbzrlepages} cachemiss ${xbzrlecachemiss} overflow ${xbzrleoverflow}"); $self->log('info', "migration xbzrle cachesize: ${xbzrlecachesize} transferred ${xbzrlebytes} pages ${xbzrlepages} cachemiss ${xbzrlecachemiss} overflow ${xbzrleoverflow}");
} }
if (($lastrem && $rem > $lastrem ) || ($rem == 0)) { if (($lastrem && $rem > $lastrem) || ($rem == 0)) {
$downtimecounter++; $downtimecounter++;
} }
$lastrem = $rem; $lastrem = $rem;
@ -1129,7 +1131,7 @@ sub phase2 {
} }
} }
$lstat = $stat->{ram}->{transferred}; $last_mem_transferred = $memstat->{transferred};
} }
if ($self->{storage_migration}) { if ($self->{storage_migration}) {